Merge pull request #81 from geoadmin/feat-PB-302-add-icon-size-to-met…

…adata PB-302: Add icon size to metadata
geoadmin · Sep 4, 2024 · d9fc68b · d9fc68b
2 parents 32d84df + 5af89c1
commit d9fc68b
Show file tree

Hide file tree

Showing 586 changed files with 62 additions and 23 deletions.
diff --git a/app/helpers/description.py b/app/helpers/description.py
@@ -21,7 +21,7 @@ def get_icon_set_description(icon_set=''):
     with open(path, encoding='utf-8') as f:
         icon_set_descriptions = json.load(f)
 
-    return icon_set_descriptions
+    return [icon_set_descriptions]
 
 
 def get_icon_description(icon_name='', icon_set=''):

diff --git a/app/icon.py b/app/icon.py
@@ -1,5 +1,7 @@
 import os
 
+from PIL import Image
+
 from flask import url_for
 
 from app.helpers.description import get_icon_description
@@ -83,6 +85,16 @@ def get_icon_filepath(self):
             name_with_extension = f"{name_with_extension}.png"
         return os.path.abspath(os.path.join(IMAGE_FOLDER, self.icon_set.name, name_with_extension))
 
+    def get_size(self):
+        """
+        Lazily open image of icon to get the size of the icon from the metadata.
+
+        Returns:
+            A tuple with the size of the specified icon (x,y)
+        """
+        with Image.open(self.get_icon_filepath()) as img:
+            return img.size
+
     def serialize(self):
         """
         As we want to add "url" to the __dict__, we can't really use a json.dumps to generate our
@@ -99,5 +111,6 @@ def serialize(self):
             "icon_set": self.icon_set.name,
             "url": self.get_icon_url(),
             "template_url": get_icon_template_url(get_base_url()),
-            "description": get_icon_description(self.name, self.icon_set.name)
+            "description": get_icon_description(self.name, self.icon_set.name),
+            "size": self.get_size()
         }
diff --git a/app/icon_set.py b/app/icon_set.py
@@ -100,16 +100,6 @@ def get_icon(self, icon_name):
         """
         return Icon(f"{icon_name}", self)
 
-    def get_default_pixel_size(self):
-        """
-        Returns:
-            the size in pixel of this icon set's icon (icons are always square images). This is
-                helpful to calculate if an icon requires a resize before being served to the user.
-        """
-        if self.name == 'default':
-            return 96
-        return 48
-
     def get_all_icons(self):
         """
         Generate a list of all icons belonging to this icon set.

diff --git a/app/routes.py b/app/routes.py
@@ -94,9 +94,9 @@ def colorized_icon(
         image = Image.open(fd)
         if image.mode == 'P':
             image = image.convert('RGBA')
-        new_size = int(48 * scale)
-        if new_size != icon_set.get_default_pixel_size():
-            image = image.resize((new_size, new_size))
+        if scale != 1:
+            new_size = map(lambda s: int(s * scale), icon.get_size())
+            image = image.resize(new_size)
         if icon_set.colorable:
             image = Image.composite(Image.new("RGB", image.size, (red, green, blue)), image, image)
         output = BytesIO()

diff --git a/app/settings.py b/app/settings.py
@@ -16,6 +16,7 @@
 
 COLORABLE_ICON_SETS = ['default']
 DEFAULT_COLOR = {"r": '255', "g": '0', "b": '0'}
+DEFAULT_ICON_SIZE = 48
 TRAP_HTTP_EXCEPTIONS = True
 LOGS_DIR = os.getenv('LOGS_DIR', str(BASE_DIR / 'logs'))
 os.environ['LOGS_DIR'] = LOGS_DIR  # Set default if not set

diff --git a/backup/default/001-marker.png b/backup/default/001-marker.png
diff --git a/backup/default/002-circle.png b/backup/default/002-circle.png
diff --git a/backup/default/003-square.png b/backup/default/003-square.png
diff --git a/backup/default/004-triangle.png b/backup/default/004-triangle.png
diff --git a/backup/default/005-star.png b/backup/default/005-star.png
diff --git a/backup/default/006-star-stroked.png b/backup/default/006-star-stroked.png
diff --git a/backup/default/007-marker-stroked.png b/backup/default/007-marker-stroked.png
diff --git a/backup/default/008-circle-stroked.png b/backup/default/008-circle-stroked.png
diff --git a/backup/default/009-square-stroked.png b/backup/default/009-square-stroked.png
diff --git a/backup/default/010-triangle-stroked.png b/backup/default/010-triangle-stroked.png
diff --git a/backup/default/011-cross.png b/backup/default/011-cross.png
diff --git a/backup/default/012-disability.png b/backup/default/012-disability.png
diff --git a/backup/default/013-danger.png b/backup/default/013-danger.png
diff --git a/backup/default/014-art-gallery.png b/backup/default/014-art-gallery.png
diff --git a/backup/default/015-alcohol-shop.png b/backup/default/015-alcohol-shop.png
diff --git a/backup/default/016-bakery.png b/backup/default/016-bakery.png
diff --git a/backup/default/017-bank.png b/backup/default/017-bank.png
diff --git a/backup/default/018-bar.png b/backup/default/018-bar.png
diff --git a/backup/default/019-beer.png b/backup/default/019-beer.png
diff --git a/backup/default/020-cafe.png b/backup/default/020-cafe.png
diff --git a/backup/default/021-cinema.png b/backup/default/021-cinema.png
diff --git a/backup/default/022-commercial.png b/backup/default/022-commercial.png
diff --git a/backup/default/023-clothing-store.png b/backup/default/023-clothing-store.png
diff --git a/backup/default/024-grocery.png b/backup/default/024-grocery.png
diff --git a/backup/default/025-fast-food.png b/backup/default/025-fast-food.png
diff --git a/backup/default/026-hairdresser.png b/backup/default/026-hairdresser.png
diff --git a/backup/default/027-fuel.png b/backup/default/027-fuel.png
diff --git a/backup/default/028-laundry.png b/backup/default/028-laundry.png
diff --git a/backup/default/029-library.png b/backup/default/029-library.png
diff --git a/backup/default/030-lodging.png b/backup/default/030-lodging.png
diff --git a/backup/default/031-pharmacy.png b/backup/default/031-pharmacy.png
diff --git a/backup/default/032-restaurant.png b/backup/default/032-restaurant.png
diff --git a/backup/default/033-shop.png b/backup/default/033-shop.png
diff --git a/backup/default/034-airport.png b/backup/default/034-airport.png
diff --git a/backup/default/035-bicycle.png b/backup/default/035-bicycle.png
diff --git a/backup/default/036-bus.png b/backup/default/036-bus.png
diff --git a/backup/default/037-car.png b/backup/default/037-car.png
diff --git a/backup/default/038-ferry.png b/backup/default/038-ferry.png
diff --git a/backup/default/039-london-underground.png b/backup/default/039-london-underground.png
diff --git a/backup/default/040-rail.png b/backup/default/040-rail.png
diff --git a/backup/default/041-rail-above.png b/backup/default/041-rail-above.png
diff --git a/backup/default/042-rail-light.png b/backup/default/042-rail-light.png
diff --git a/backup/default/043-rail-metro.png b/backup/default/043-rail-metro.png
diff --git a/backup/default/044-rail-underground.png b/backup/default/044-rail-underground.png
diff --git a/backup/default/045-scooter.png b/backup/default/045-scooter.png
diff --git a/backup/default/046-america-football.png b/backup/default/046-america-football.png
diff --git a/backup/default/047-baseball.png b/backup/default/047-baseball.png
diff --git a/backup/default/048-basketball.png b/backup/default/048-basketball.png
diff --git a/backup/default/049-cricket.png b/backup/default/049-cricket.png
diff --git a/backup/default/050-golf.png b/backup/default/050-golf.png
diff --git a/backup/default/051-skiing.png b/backup/default/051-skiing.png
diff --git a/backup/default/052-soccer.png b/backup/default/052-soccer.png
diff --git a/backup/default/053-swimming.png b/backup/default/053-swimming.png
diff --git a/backup/default/054-tennis.png b/backup/default/054-tennis.png
diff --git a/backup/default/055-airfield.png b/backup/default/055-airfield.png
diff --git a/backup/default/056-building.png b/backup/default/056-building.png
diff --git a/backup/default/057-campsite.png b/backup/default/057-campsite.png
diff --git a/backup/default/058-cemetery.png b/backup/default/058-cemetery.png
diff --git a/backup/default/059-city.png b/backup/default/059-city.png
diff --git a/backup/default/060-college.png b/backup/default/060-college.png
diff --git a/backup/default/061-dog-park.png b/backup/default/061-dog-park.png
diff --git a/backup/default/062-embassy.png b/backup/default/062-embassy.png
diff --git a/backup/default/063-farm.png b/backup/default/063-farm.png
diff --git a/backup/default/064-fire-station.png b/backup/default/064-fire-station.png
diff --git a/backup/default/065-garden.png b/backup/default/065-garden.png
diff --git a/backup/default/066-harbor.png b/backup/default/066-harbor.png
diff --git a/backup/default/067-heliport.png b/backup/default/067-heliport.png
diff --git a/backup/default/068-hospital.png b/backup/default/068-hospital.png
diff --git a/backup/default/069-industrial.png b/backup/default/069-industrial.png
diff --git a/backup/default/070-land-use.png b/backup/default/070-land-use.png
diff --git a/backup/default/071-lighthouse.png b/backup/default/071-lighthouse.png
diff --git a/backup/default/072-monument.png b/backup/default/072-monument.png
diff --git a/backup/default/073-minefield.png b/backup/default/073-minefield.png
diff --git a/backup/default/074-museum.png b/backup/default/074-museum.png
diff --git a/backup/default/075-oil-well.png b/backup/default/075-oil-well.png
diff --git a/backup/default/076-park2.png b/backup/default/076-park2.png
diff --git a/backup/default/077-park.png b/backup/default/077-park.png
diff --git a/backup/default/078-parking.png b/backup/default/078-parking.png
diff --git a/backup/default/079-parking-garage.png b/backup/default/079-parking-garage.png
diff --git a/backup/default/080-pitch.png b/backup/default/080-pitch.png
diff --git a/backup/default/081-place-of-worship.png b/backup/default/081-place-of-worship.png
diff --git a/backup/default/082-playground.png b/backup/default/082-playground.png
diff --git a/backup/default/083-police.png b/backup/default/083-police.png
diff --git a/backup/default/084-polling-place.png b/backup/default/084-polling-place.png
diff --git a/backup/default/085-post.png b/backup/default/085-post.png
diff --git a/backup/default/086-religious-christian.png b/backup/default/086-religious-christian.png
diff --git a/backup/default/087-religious-jewish.png b/backup/default/087-religious-jewish.png
diff --git a/backup/default/088-religious-muslim.png b/backup/default/088-religious-muslim.png
diff --git a/backup/default/089-prison.png b/backup/default/089-prison.png
diff --git a/backup/default/090-school.png b/backup/default/090-school.png
diff --git a/backup/default/091-slaughterhouse.png b/backup/default/091-slaughterhouse.png
diff --git a/backup/default/092-theatre.png b/backup/default/092-theatre.png
diff --git a/backup/default/093-toilets.png b/backup/default/093-toilets.png
diff --git a/backup/default/094-town.png b/backup/default/094-town.png
diff --git a/backup/default/095-town-hall.png b/backup/default/095-town-hall.png
diff --git a/backup/default/096-village.png b/backup/default/096-village.png
diff --git a/backup/default/097-warehouse.png b/backup/default/097-warehouse.png
diff --git a/backup/default/098-wetland.png b/backup/default/098-wetland.png
diff --git a/backup/default/099-zoo.png b/backup/default/099-zoo.png
diff --git a/backup/default/100-camera.png b/backup/default/100-camera.png
diff --git a/backup/default/101-chemist.png b/backup/default/101-chemist.png
diff --git a/backup/default/102-dam.png b/backup/default/102-dam.png
diff --git a/backup/default/103-emergency-telephone.png b/backup/default/103-emergency-telephone.png
diff --git a/backup/default/104-entrance.png b/backup/default/104-entrance.png
diff --git a/backup/default/105-heart.png b/backup/default/105-heart.png
diff --git a/backup/default/106-logging.png b/backup/default/106-logging.png
diff --git a/backup/default/107-mobilephone.png b/backup/default/107-mobilephone.png
diff --git a/backup/default/108-music.png b/backup/default/108-music.png
diff --git a/backup/default/109-roadblock.png b/backup/default/109-roadblock.png
diff --git a/backup/default/110-rocket.png b/backup/default/110-rocket.png
diff --git a/backup/default/111-suitcase.png b/backup/default/111-suitcase.png
diff --git a/backup/default/112-telephone.png b/backup/default/112-telephone.png
diff --git a/backup/default/113-waste-basket.png b/backup/default/113-waste-basket.png
diff --git a/backup/default/114-water.png b/backup/default/114-water.png
diff --git a/backup/default/115-gift.png b/backup/default/115-gift.png
diff --git a/backup/default/116-ice-cream.png b/backup/default/116-ice-cream.png
diff --git a/static/images/babs-D/001-D-Beschaedigung.png b/static/images/babs-D/001-D-Beschaedigung.png
diff --git a/static/images/babs-D/002-D-Teilzerstoerung.png b/static/images/babs-D/002-D-Teilzerstoerung.png
diff --git a/static/images/babs-D/003-D-Totalzerstoerung.png b/static/images/babs-D/003-D-Totalzerstoerung.png
diff --git a/static/images/babs-D/004-D-Brand-einzelnes-Gebaeude-Flamme.png b/static/images/babs-D/004-D-Brand-einzelnes-Gebaeude-Flamme.png
diff --git a/static/images/babs-D/005-D-Explosionsherd.png b/static/images/babs-D/005-D-Explosionsherd.png
diff --git a/static/images/babs-D/006-D-Verletzte.png b/static/images/babs-D/006-D-Verletzte.png
diff --git a/static/images/babs-D/007-D-Eingesperrte.png b/static/images/babs-D/007-D-Eingesperrte.png
diff --git a/static/images/babs-D/008-D-Obdachlose.png b/static/images/babs-D/008-D-Obdachlose.png
diff --git a/static/images/babs-D/009-D-Tote.png b/static/images/babs-D/009-D-Tote.png
diff --git a/static/images/babs-D/010-D-Vermisste.png b/static/images/babs-D/010-D-Vermisste.png
diff --git a/static/images/babs-D/011-D-Armee.png b/static/images/babs-D/011-D-Armee.png
diff --git a/static/images/babs-D/012-D-Polizei.png b/static/images/babs-D/012-D-Polizei.png
diff --git a/static/images/babs-D/013-D-Zivilschutz.png b/static/images/babs-D/013-D-Zivilschutz.png
diff --git a/static/images/babs-D/014-D-Sanitaer.png b/static/images/babs-D/014-D-Sanitaer.png
diff --git a/static/images/babs-D/015-D-Feuerwehr.png b/static/images/babs-D/015-D-Feuerwehr.png
diff --git a/static/images/babs-D/016-D-TechnB.png b/static/images/babs-D/016-D-TechnB.png
diff --git a/static/images/babs-D/017-D-Unfall.png b/static/images/babs-D/017-D-Unfall.png
diff --git a/static/images/babs-D/018-D-Chemikalien.png b/static/images/babs-D/018-D-Chemikalien.png
diff --git a/static/images/babs-D/019-D-Elektrizitaet.png b/static/images/babs-D/019-D-Elektrizitaet.png
diff --git a/static/images/babs-D/020-D-Explosion.png b/static/images/babs-D/020-D-Explosion.png
diff --git a/static/images/babs-D/021-D-Gas.png b/static/images/babs-D/021-D-Gas.png
diff --git a/static/images/babs-D/022-D-Gefahr-durch-Loeschen-mit-Wasser.png b/static/images/babs-D/022-D-Gefahr-durch-Loeschen-mit-Wasser.png
diff --git a/static/images/babs-D/023-D-Radioaktive-Stoffe.png b/static/images/babs-D/023-D-Radioaktive-Stoffe.png
diff --git a/static/images/babs-D/024-D-Gefahr-fuer-Grundwasser.png b/static/images/babs-D/024-D-Gefahr-fuer-Grundwasser.png
diff --git a/static/images/babs-D/025-D-KFO.png b/static/images/babs-D/025-D-KFO.png
diff --git a/static/images/babs-D/026-D-RFO.png b/static/images/babs-D/026-D-RFO.png
diff --git a/static/images/babs-D/027-D-GFO.png b/static/images/babs-D/027-D-GFO.png
diff --git a/static/images/babs-D/028-D-EZ.png b/static/images/babs-D/028-D-EZ.png
diff --git a/static/images/babs-D/029-D-MEZ.png b/static/images/babs-D/029-D-MEZ.png
diff --git a/static/images/babs-D/030-D-EL.png b/static/images/babs-D/030-D-EL.png
diff --git a/static/images/babs-D/031-D-Rueck.png b/static/images/babs-D/031-D-Rueck.png
diff --git a/static/images/babs-D/032-D-Front.png b/static/images/babs-D/032-D-Front.png
diff --git a/static/images/babs-D/033-D-Informationsstelle.png b/static/images/babs-D/033-D-Informationsstelle.png
diff --git a/static/images/babs-D/034-D-Sammelstelle.png b/static/images/babs-D/034-D-Sammelstelle.png
diff --git a/static/images/babs-D/035-D-Betreuungsstelle.png b/static/images/babs-D/035-D-Betreuungsstelle.png
diff --git a/static/images/babs-D/036-D-Patientensammelstelle.png b/static/images/babs-D/036-D-Patientensammelstelle.png
diff --git a/static/images/babs-D/037-D-Sanitaetshilfsstelle.png b/static/images/babs-D/037-D-Sanitaetshilfsstelle.png
diff --git a/static/images/babs-D/038-D-Totensammelstelle.png b/static/images/babs-D/038-D-Totensammelstelle.png
diff --git a/static/images/babs-D/039-D-Verpflegungsabgabestelle.png b/static/images/babs-D/039-D-Verpflegungsabgabestelle.png
diff --git a/static/images/babs-D/040-D-Betriebsstoffabgabestelle.png b/static/images/babs-D/040-D-Betriebsstoffabgabestelle.png
diff --git a/static/images/babs-D/041-D-KGS-Notdepot.png b/static/images/babs-D/041-D-KGS-Notdepot.png
diff --git a/static/images/babs-D/042-D-Pforte.png b/static/images/babs-D/042-D-Pforte.png
diff --git a/static/images/babs-D/043-D-Umleitung.png b/static/images/babs-D/043-D-Umleitung.png
diff --git a/static/images/babs-D/044-D-Absperrung-Verkehrswege.png b/static/images/babs-D/044-D-Absperrung-Verkehrswege.png
diff --git a/static/images/babs-D/045-D-Sperre.png b/static/images/babs-D/045-D-Sperre.png
diff --git a/static/images/babs-D/046-D-Helikopterlandeplatz.png b/static/images/babs-D/046-D-Helikopterlandeplatz.png
diff --git a/static/images/babs-D/047-D-Fahrzeugplatz.png b/static/images/babs-D/047-D-Fahrzeugplatz.png
diff --git a/static/images/babs-D/048-D-Materialdepot.png b/static/images/babs-D/048-D-Materialdepot.png
diff --git a/static/images/babs-D/049-D-Beobachtung.png b/static/images/babs-D/049-D-Beobachtung.png
diff --git a/static/images/babs-D/050-D-Ueberwachung.png b/static/images/babs-D/050-D-Ueberwachung.png
diff --git a/static/images/babs-D/051-D-Sturm.png b/static/images/babs-D/051-D-Sturm.png
diff --git a/static/images/babs-D/052-D-Ueberschwemmung.png b/static/images/babs-D/052-D-Ueberschwemmung.png
diff --git a/static/images/babs-D/053-D-Erdrutsch.png b/static/images/babs-D/053-D-Erdrutsch.png
diff --git a/static/images/babs-D/054-D-Lawine.png b/static/images/babs-D/054-D-Lawine.png
diff --git a/static/images/babs-D/055-D-Gebaeudeeinsturz.png b/static/images/babs-D/055-D-Gebaeudeeinsturz.png
diff --git a/static/images/babs-D/056-D-Starkniederschlag.png b/static/images/babs-D/056-D-Starkniederschlag.png
diff --git a/static/images/babs-D/057-D-Brand.png b/static/images/babs-D/057-D-Brand.png
diff --git a/static/images/babs-D/058-D-Explosion-pikt.png b/static/images/babs-D/058-D-Explosion-pikt.png
diff --git a/static/images/babs-D/059-D-Stau.png b/static/images/babs-D/059-D-Stau.png
diff --git a/static/images/babs-D/060-D-Autounfall.png b/static/images/babs-D/060-D-Autounfall.png
diff --git a/static/images/babs-D/061-D-Eisenbahnunglueck.png b/static/images/babs-D/061-D-Eisenbahnunglueck.png
diff --git a/static/images/babs-D/062-D-Kanalisationsausfall.png b/static/images/babs-D/062-D-Kanalisationsausfall.png
diff --git a/static/images/babs-D/063-D-Atomunfall.png b/static/images/babs-D/063-D-Atomunfall.png
diff --git a/static/images/babs-D/064-D-Biounfall.png b/static/images/babs-D/064-D-Biounfall.png
diff --git a/static/images/babs-D/065-D-Oelverschmutzung.png b/static/images/babs-D/065-D-Oelverschmutzung.png
diff --git a/static/images/babs-D/066-D-Infrastrukturschaden.png b/static/images/babs-D/066-D-Infrastrukturschaden.png
diff --git a/static/images/babs-D/067-D-Schiffsversenkung.png b/static/images/babs-D/067-D-Schiffsversenkung.png
diff --git a/static/images/babs-D/068-D-Chemieunfall.png b/static/images/babs-D/068-D-Chemieunfall.png
diff --git a/static/images/babs-D/069-D-Pluenderung.png b/static/images/babs-D/069-D-Pluenderung.png
diff --git a/static/images/babs-D/070-D-Demo-gewaltlos.png b/static/images/babs-D/070-D-Demo-gewaltlos.png
diff --git a/static/images/babs-D/071-D-Demo-gewaltsam.png b/static/images/babs-D/071-D-Demo-gewaltsam.png
diff --git a/static/images/babs-D/072-D-Massenpanik.png b/static/images/babs-D/072-D-Massenpanik.png
diff --git a/static/images/babs-D/073-D-Brandanschlag.png b/static/images/babs-D/073-D-Brandanschlag.png
diff --git a/static/images/babs-D/074-D-Sabotage.png b/static/images/babs-D/074-D-Sabotage.png
diff --git a/static/images/babs-D/075-D-Bombenanschlag.png b/static/images/babs-D/075-D-Bombenanschlag.png
diff --git a/static/images/babs-D/076-D-Trupp-p-P.png b/static/images/babs-D/076-D-Trupp-p-P.png
diff --git a/static/images/babs-D/077-D-Gruppe-p-P.png b/static/images/babs-D/077-D-Gruppe-p-P.png
diff --git a/static/images/babs-D/078-D-Zug-p-P.png b/static/images/babs-D/078-D-Zug-p-P.png
diff --git a/static/images/babs-D/079-D-Gruppenfuehrer-P.png b/static/images/babs-D/079-D-Gruppenfuehrer-P.png
diff --git a/static/images/babs-D/080-D-Offizier-Zugfuehrer-P.png b/static/images/babs-D/080-D-Offizier-Zugfuehrer-P.png
diff --git a/static/images/babs-D/081-D-Einsatzleiter-P.png b/static/images/babs-D/081-D-Einsatzleiter-P.png
diff --git a/static/images/babs-D/082-D-Trupp-p-FW.png b/static/images/babs-D/082-D-Trupp-p-FW.png
diff --git a/static/images/babs-D/083-D-Gruppe-p-FW.png b/static/images/babs-D/083-D-Gruppe-p-FW.png
diff --git a/static/images/babs-D/084-D-Zug-p-FW.png b/static/images/babs-D/084-D-Zug-p-FW.png
diff --git a/static/images/babs-D/085-D-Gruppenfuehrer-FW.png b/static/images/babs-D/085-D-Gruppenfuehrer-FW.png
diff --git a/static/images/babs-D/086-D-Offizier-Zugfuehrer-FW.png b/static/images/babs-D/086-D-Offizier-Zugfuehrer-FW.png
diff --git a/static/images/babs-D/087-D-Einsatzleiter-FW.png b/static/images/babs-D/087-D-Einsatzleiter-FW.png
diff --git a/static/images/babs-D/088-D-Trupp-p-San.png b/static/images/babs-D/088-D-Trupp-p-San.png
diff --git a/static/images/babs-D/089-D-Gruppe-p-San.png b/static/images/babs-D/089-D-Gruppe-p-San.png
diff --git a/static/images/babs-D/090-D-Trupp-p.png b/static/images/babs-D/090-D-Trupp-p.png
diff --git a/static/images/babs-D/091-D-Gruppe-p.png b/static/images/babs-D/091-D-Gruppe-p.png
diff --git a/static/images/babs-D/092-D-Zug-p.png b/static/images/babs-D/092-D-Zug-p.png
diff --git a/static/images/babs-D/093-D-Kompanie.png b/static/images/babs-D/093-D-Kompanie.png
diff --git a/static/images/babs-D/094-D-Bataillon.png b/static/images/babs-D/094-D-Bataillon.png
diff --git a/static/images/babs-D/095-D-Gruppenfuehrer.png b/static/images/babs-D/095-D-Gruppenfuehrer.png
diff --git a/static/images/babs-D/096-D-Offizier-Zugfuehrer.png b/static/images/babs-D/096-D-Offizier-Zugfuehrer.png
diff --git a/static/images/babs-D/097-D-Einsatzleiter.png b/static/images/babs-D/097-D-Einsatzleiter.png
diff --git a/static/images/babs-D/098-D-Beabsichtigter-Einsatz.png b/static/images/babs-D/098-D-Beabsichtigter-Einsatz.png
diff --git a/static/images/babs-D/099-D-Beabsichtigte-Erkundung.png b/static/images/babs-D/099-D-Beabsichtigte-Erkundung.png
diff --git a/static/images/babs-D/100-D-Durchgefuehrter-Einsatz.png b/static/images/babs-D/100-D-Durchgefuehrter-Einsatz.png
diff --git a/static/images/babs-D/101-D-Durchgefuehrte-Erkundung.png b/static/images/babs-D/101-D-Durchgefuehrte-Erkundung.png
diff --git a/static/images/babs-D/102-D-Motorfahrzeug.png b/static/images/babs-D/102-D-Motorfahrzeug.png
diff --git a/static/images/babs-D/103-D-Lastwagen.png b/static/images/babs-D/103-D-Lastwagen.png
diff --git a/static/images/babs-D/104-D-Transportfahrzeug.png b/static/images/babs-D/104-D-Transportfahrzeug.png
diff --git a/static/images/babs-D/105-D-Ambulanz.png b/static/images/babs-D/105-D-Ambulanz.png
diff --git a/static/images/babs-D/106-D-Helikopter.png b/static/images/babs-D/106-D-Helikopter.png
diff --git a/static/images/babs-D/107-D-Tankloeschfahrzeug.png b/static/images/babs-D/107-D-Tankloeschfahrzeug.png
diff --git a/static/images/babs-D/108-D-Wasserwerfer.png b/static/images/babs-D/108-D-Wasserwerfer.png
diff --git a/static/images/babs-D/109-D-Hubrettungsfahrzeug.png b/static/images/babs-D/109-D-Hubrettungsfahrzeug.png
diff --git a/static/images/babs-D/110-D-Autodrehleiter.png b/static/images/babs-D/110-D-Autodrehleiter.png
diff --git a/static/images/babs-D/111-D-Nationalstrasse.png b/static/images/babs-D/111-D-Nationalstrasse.png
diff --git a/static/images/babs-D/112-D-Autobahn.png b/static/images/babs-D/112-D-Autobahn.png
diff --git a/static/images/babs-D/113-D-Eisenbahn.png b/static/images/babs-D/113-D-Eisenbahn.png
diff --git a/static/images/babs-D/114-D-Schiffahrt-Verbot.png b/static/images/babs-D/114-D-Schiffahrt-Verbot.png
diff --git a/static/images/babs-D/115-D-Ueberflugverbot.png b/static/images/babs-D/115-D-Ueberflugverbot.png
diff --git a/static/images/babs-D/116-D-Notfalltreffpunkt.png b/static/images/babs-D/116-D-Notfalltreffpunkt.png
diff --git a/static/images/babs-F/001-F-Degat.png b/static/images/babs-F/001-F-Degat.png
diff --git a/static/images/babs-F/002-F-Destruction-partielle.png b/static/images/babs-F/002-F-Destruction-partielle.png
diff --git a/static/images/babs-F/003-F-Destruction-totale.png b/static/images/babs-F/003-F-Destruction-totale.png
diff --git a/static/images/babs-F/004-F-Incendie-isole.png b/static/images/babs-F/004-F-Incendie-isole.png
diff --git a/static/images/babs-F/005-F-Foyer-d-explosion.png b/static/images/babs-F/005-F-Foyer-d-explosion.png
diff --git a/static/images/babs-F/006-F-Blesses.png b/static/images/babs-F/006-F-Blesses.png
diff --git a/static/images/babs-F/007-F-Enfermes.png b/static/images/babs-F/007-F-Enfermes.png
diff --git a/static/images/babs-F/008-F-Sans-abri.png b/static/images/babs-F/008-F-Sans-abri.png
diff --git a/static/images/babs-F/009-F-Morts.png b/static/images/babs-F/009-F-Morts.png
diff --git a/static/images/babs-F/010-F-Disparus.png b/static/images/babs-F/010-F-Disparus.png
diff --git a/static/images/babs-F/011-F-Armee.png b/static/images/babs-F/011-F-Armee.png
diff --git a/static/images/babs-F/012-F-Police.png b/static/images/babs-F/012-F-Police.png
diff --git a/static/images/babs-F/013-F-Protection-civile.png b/static/images/babs-F/013-F-Protection-civile.png
diff --git a/static/images/babs-F/014-F-Sanitaire.png b/static/images/babs-F/014-F-Sanitaire.png
diff --git a/static/images/babs-F/015-F-Sapeurs-pompiers.png b/static/images/babs-F/015-F-Sapeurs-pompiers.png
diff --git a/static/images/babs-F/016-F-Services-techniques.png b/static/images/babs-F/016-F-Services-techniques.png
diff --git a/static/images/babs-F/017-F-Accident.png b/static/images/babs-F/017-F-Accident.png
diff --git a/static/images/babs-F/018-F-Chimique.png b/static/images/babs-F/018-F-Chimique.png
diff --git a/static/images/babs-F/019-F-Electricite.png b/static/images/babs-F/019-F-Electricite.png
diff --git a/static/images/babs-F/020-F-Explosion.png b/static/images/babs-F/020-F-Explosion.png
diff --git a/static/images/babs-F/021-F-Gaz.png b/static/images/babs-F/021-F-Gaz.png
diff --git a/static/images/babs-F/022-F-Danger-si-extinction-avec-eau.png b/static/images/babs-F/022-F-Danger-si-extinction-avec-eau.png
diff --git a/static/images/babs-F/023-F-Substances-radioactives.png b/static/images/babs-F/023-F-Substances-radioactives.png
diff --git a/static/images/babs-F/024-F-Danger-pour-les-eaux.png b/static/images/babs-F/024-F-Danger-pour-les-eaux.png
diff --git a/static/images/babs-F/025-F-OCC.png b/static/images/babs-F/025-F-OCC.png
diff --git a/static/images/babs-F/026-F-OCRg.png b/static/images/babs-F/026-F-OCRg.png
diff --git a/static/images/babs-F/027-F-OCCm.png b/static/images/babs-F/027-F-OCCm.png
diff --git a/static/images/babs-F/028-F-CE.png b/static/images/babs-F/028-F-CE.png
diff --git a/static/images/babs-F/029-F-CEM.png b/static/images/babs-F/029-F-CEM.png
diff --git a/static/images/babs-F/030-F-DI.png b/static/images/babs-F/030-F-DI.png
diff --git a/static/images/babs-F/031-F-PCO.png b/static/images/babs-F/031-F-PCO.png
diff --git a/static/images/babs-F/032-F-PCE.png b/static/images/babs-F/032-F-PCE.png
diff --git a/static/images/babs-F/033-F-Point-d-information.png b/static/images/babs-F/033-F-Point-d-information.png
diff --git a/static/images/babs-F/034-F-Poste-collecteur.png b/static/images/babs-F/034-F-Poste-collecteur.png
diff --git a/static/images/babs-F/035-F-Poste-d-assistance.png b/static/images/babs-F/035-F-Poste-d-assistance.png
diff --git a/static/images/babs-F/036-F-Poste-collecteur-de-patients.png b/static/images/babs-F/036-F-Poste-collecteur-de-patients.png
diff --git a/static/images/babs-F/037-F-Poste-medical-avance.png b/static/images/babs-F/037-F-Poste-medical-avance.png
diff --git a/static/images/babs-F/038-F-Poste-collecteur-de-cadavres.png b/static/images/babs-F/038-F-Poste-collecteur-de-cadavres.png
diff --git a/static/images/babs-F/039-F-Poste-de-distribution.png b/static/images/babs-F/039-F-Poste-de-distribution.png
diff --git a/static/images/babs-F/040-F-Station-de-carburant.png b/static/images/babs-F/040-F-Station-de-carburant.png
diff --git a/static/images/babs-F/041-F-Depot-d-urgence-PBC.png b/static/images/babs-F/041-F-Depot-d-urgence-PBC.png
diff --git a/static/images/babs-F/042-F-Porte.png b/static/images/babs-F/042-F-Porte.png
diff --git a/static/images/babs-F/043-F-Deviations.png b/static/images/babs-F/043-F-Deviations.png
diff --git a/static/images/babs-F/044-F-Fermeture-de-la-route.png b/static/images/babs-F/044-F-Fermeture-de-la-route.png
diff --git a/static/images/babs-F/045-F-Barrage.png b/static/images/babs-F/045-F-Barrage.png
diff --git a/static/images/babs-F/046-F-Place-d-atterrissage-Helico.png b/static/images/babs-F/046-F-Place-d-atterrissage-Helico.png
diff --git a/static/images/babs-F/047-F-Place-pour-vehicules.png b/static/images/babs-F/047-F-Place-pour-vehicules.png
diff --git a/static/images/babs-F/048-F-Depot-materiel.png b/static/images/babs-F/048-F-Depot-materiel.png
diff --git a/static/images/babs-F/049-F-Observation.png b/static/images/babs-F/049-F-Observation.png
diff --git a/static/images/babs-F/050-F-Surveillance.png b/static/images/babs-F/050-F-Surveillance.png
diff --git a/static/images/babs-F/051-F-Tempete.png b/static/images/babs-F/051-F-Tempete.png
diff --git a/static/images/babs-F/052-F-Inondation.png b/static/images/babs-F/052-F-Inondation.png
diff --git a/static/images/babs-F/053-F-Glissement-de-terrain.png b/static/images/babs-F/053-F-Glissement-de-terrain.png
diff --git a/static/images/babs-F/054-F-Avalanche.png b/static/images/babs-F/054-F-Avalanche.png
diff --git a/static/images/babs-F/055-F-Immeuble-effondre.png b/static/images/babs-F/055-F-Immeuble-effondre.png
diff --git a/static/images/babs-F/056-F-Fortes-precipitations.png b/static/images/babs-F/056-F-Fortes-precipitations.png
diff --git a/static/images/babs-F/057-F-Incendie.png b/static/images/babs-F/057-F-Incendie.png
diff --git a/static/images/babs-F/058-F-Explosion.png b/static/images/babs-F/058-F-Explosion.png
diff --git a/static/images/babs-F/059-F-Embouteillage.png b/static/images/babs-F/059-F-Embouteillage.png
diff --git a/static/images/babs-F/060-F-Accident-auto.png b/static/images/babs-F/060-F-Accident-auto.png
diff --git a/static/images/babs-F/061-F-Accident-ferroviaire.png b/static/images/babs-F/061-F-Accident-ferroviaire.png
diff --git a/static/images/babs-F/062-F-Egouts-defectueux.png b/static/images/babs-F/062-F-Egouts-defectueux.png
diff --git a/static/images/babs-F/063-F-Accident-nucleaire.png b/static/images/babs-F/063-F-Accident-nucleaire.png