Merge pull request #23 from Daugl/templates

Templates
jonas-koeritz · Jul 6, 2024 · a907a91 · a907a91
2 parents 369f9cb + e86a53e
commit a907a91
Show file tree

Hide file tree

Showing 480 changed files with 5,457 additions and 1,613 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # Alle Jinja2 Templates im Ordner symbols finden
 SOURCES = $(shell find symbols/ -name *.j2)
-TEMPLATE = $(shell find symbols/ -name *.j2t)
+#TEMPLATE = $(shell find symbols/ -name *.j2t)
 
 # symbols/ prefix entfernen für die Ausgabedateien
 TARGET_PATHS = $(SOURCES:symbols/%=%)
@@ -23,7 +23,8 @@ STICKERS = $(addprefix build/sticker/,$(PNG_TARGETS))
 svg: $(SVG_FILES)
 print: $(SVG_PRINT_FILES)
 
-build/svg/%.svg: symbols/%.j2 $(TEMPLATE)
+build/svg/%.svg: symbols/%.j2 
+#$(TEMPLATE)
 	mkdir -p $(@D)
 	j2 $< themes/default.json -o $@
 

diff --git a/symbols/Bundeswehr_Fahrzeuge/Kettenfahrzeug.j2 b/symbols/Bundeswehr_Fahrzeuge/Kettenfahrzeug.j2
@@ -5,12 +5,18 @@
 		<style type="text/css">
 		{% include './fonts/fonts.j2' %}
 		</style>
-		<clipPath id="symbol">
-			<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" />
-		</clipPath>
 	</defs>
+<<<<<<< HEAD
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="#000000" stroke="none" />
+	<path d="M11,65 L11,191 L245,191 L245,65 Q128,101 11,65 Z" fill="#FFFFFF" stroke="none"/>
+	<path d="M16,72 L16,186 L240,186 L240,72 Q128,106 16,72 Z" fill="#996633" stroke="none"/>
+	<path d="M24,200 l208,0 a10,10 180 0 1 0,20 l-208,0 a10,10 180 0 1 0,-20 Z" stroke="#000000" fill="none" stroke-width="5" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end;" fill="#FFFFFF" x="236" y="180">BW</text>
+</svg>
+=======
 	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ bundeswehr.colorPrimary }}" stroke-width="10" stroke="{{ bundeswehr.colorSecondary }}" clip-path="url(#symbol)" />
 	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="{{ bundeswehr.colorStroke }}" />
 	<path d="M24,200 l208,0 a10,10 180 0 1 0,20 l-208,0 a10,10 180 0 1 0,-20 Z" stroke="{{ bundeswehr.colorStroke }}" fill="none" stroke-width="5" />
 	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end;" fill="{{ bundeswehr.colorSecondary }}" x="236" y="180">BW</text>
-</svg>
+</svg>
+>>>>>>> master
diff --git a/symbols/Bundeswehr_Fahrzeuge/Kraftfahrzeug.j2 b/symbols/Bundeswehr_Fahrzeuge/Kraftfahrzeug.j2
@@ -5,13 +5,20 @@
 		<style type="text/css">
 		{% include './fonts/fonts.j2' %}
 		</style>
-		<clipPath id="symbol">
-			<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" />
-		</clipPath>
 	</defs>
+<<<<<<< HEAD
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="#000000" stroke="none" />
+	<path d="M11,65 L11,191 L245,191 L245,65 Q128,101 11,65 Z" fill="#FFFFFF" stroke="none"/>
+	<path d="M16,72 L16,186 L240,186 L240,72 Q128,106 16,72 Z" fill="#996633" stroke="none"/>
+	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end;" fill="#FFFFFF" x="236" y="180">BW</text>
+</svg>
+=======
 	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ bundeswehr.colorPrimary }}" stroke-width="10" stroke="{{ bundeswehr.colorSecondary }}" clip-path="url(#symbol)" />
 	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="{{ bundeswehr.colorStroke }}" />
 	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="{{ bundeswehr.colorStroke }}" fill="none" stroke-width="5" />
 	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="{{ bundeswehr.colorStroke }}" fill="none" stroke-width="5" />
 	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end;" fill="{{ bundeswehr.colorSecondary }}" x="236" y="180">BW</text>
-</svg>
+</svg>
+>>>>>>> master
diff --git a/symbols/Bundeswehr_Fahrzeuge/Kraftfahrzeug_geländegängig.j2 b/symbols/Bundeswehr_Fahrzeuge/Kraftfahrzeug_geländegängig.j2
@@ -5,14 +5,22 @@
 		<style type="text/css">
 		{% include './fonts/fonts.j2' %}
 		</style>
-		<clipPath id="symbol">
-			<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" />
-		</clipPath>
 	</defs>
+<<<<<<< HEAD
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="#000000" stroke="none" />
+	<path d="M11,65 L11,191 L245,191 L245,65 Q128,101 11,65 Z" fill="#FFFFFF" stroke="none"/>
+	<path d="M16,72 L16,186 L240,186 L240,72 Q128,106 16,72 Z" fill="#996633" stroke="none"/>
+	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
+	<ellipse cx="128" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end;" fill="#FFFFFF" x="236" y="180">BW</text>
+</svg>
+=======
 	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ bundeswehr.colorPrimary }}" stroke-width="10" stroke="{{ bundeswehr.colorSecondary }}" clip-path="url(#symbol)" />
 	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="{{ bundeswehr.colorStroke }}" />
 	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="{{ bundeswehr.colorStroke }}" fill="none" stroke-width="5" />
 	<ellipse cx="128" cy="210" rx="10" ry="10" stroke="{{ bundeswehr.colorStroke }}" fill="none" stroke-width="5" />
 	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="{{ bundeswehr.colorStroke }}" fill="none" stroke-width="5" />
 	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end;" fill="{{ bundeswehr.colorSecondary }}" x="236" y="180">BW</text>
-</svg>
+</svg>
+>>>>>>> master
diff --git a/symbols/Einheiten/Führungsgruppe.j2 b/symbols/Einheiten/Führungsgruppe.j2
@@ -1,13 +1,8 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Führungsgruppe</title>
-	<defs>
-		<clipPath id="symbol">
-			<rect x="10" y="64" width="236" height="128" />
-		</clipPath>
-	</defs>
-	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
-	<rect x="10" y="64" width="236" height="25" fill="#000000" />
+	<rect x="10" y="64" width="236" height="128" stroke="none" fill="#000000" />
+	<rect x="15" y="89" width="226" height="98" stroke="none" fill="#FFFFFF" />
 	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="#000000" />
 	<ellipse cx="192" cy="48" rx="10" ry="10" fill="#000000" />
-</svg>
+</svg>
diff --git a/symbols/Einheiten/Führungsstaffel.j2 b/symbols/Einheiten/Führungsstaffel.j2
@@ -1,13 +1,8 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Führungsstaffel</title>
-	<defs>
-		<clipPath id="symbol">
-			<rect x="10" y="64" width="236" height="128" />
-		</clipPath>
-	</defs>
-	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
-	<rect x="10" y="64" width="236" height="25" fill="#000000" />
+	<rect x="10" y="64" width="236" height="128" stroke="none" fill="#000000" />
+	<rect x="15" y="89" width="226" height="98" stroke="none" fill="#FFFFFF" />>
 	<ellipse cx="128" cy="48" rx="10" ry="10" fill="#000000" />
 	<ellipse cx="128" cy="24" rx="10" ry="10" fill="#000000" />
-</svg>
+</svg>
diff --git a/symbols/Einheiten/Führungstrupp.j2 b/symbols/Einheiten/Führungstrupp.j2
@@ -1,12 +1,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Führungstrupp</title>
-	<defs>
-		<clipPath id="symbol">
-			<rect x="10" y="64" width="236" height="128" />
-		</clipPath>
-	</defs>
-	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
-	<rect x="10" y="64" width="236" height="25" fill="#000000" />
+	<rect x="10" y="64" width="236" height="128" stroke="none" fill="#000000" />
+	<rect x="15" y="89" width="226" height="98" stroke="none" fill="#FFFFFF" />
 	<ellipse cx="128" cy="48" rx="10" ry="10" fill="#000000" />
-</svg>
+</svg>
diff --git a/symbols/Einheiten/Gruppe.j2 b/symbols/Einheiten/Gruppe.j2
@@ -1,12 +1,8 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Gruppe</title>
-	<defs>
-		<clipPath id="symbol">
-			<rect x="10" y="64" width="236" height="128" />
-		</clipPath>
-	</defs>
-	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
+	<rect x="10" y="64" width="236" height="128" stroke="none" fill="#000000" />
+	<rect x="15" y="69" width="226" height="118" stroke="none" fill="#FFFFFF" />
 	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="#000000" />
 	<ellipse cx="192" cy="48" rx="10" ry="10" fill="#000000" />
-</svg>
+</svg>
diff --git a/symbols/Einheiten/Staffel.j2 b/symbols/Einheiten/Staffel.j2
@@ -1,12 +1,8 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Staffel</title>
-	<defs>
-		<clipPath id="symbol">
-			<rect x="10" y="64" width="236" height="128" />
-		</clipPath>
-	</defs>
-	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
+	<rect x="10" y="64" width="236" height="128" stroke="none" fill="#000000" />
+	<rect x="15" y="69" width="226" height="118" stroke="none" fill="#FFFFFF" />
 	<ellipse cx="128" cy="48" rx="10" ry="10" fill="#000000" />
 	<ellipse cx="128" cy="24" rx="10" ry="10" fill="#000000" />
-</svg>
+</svg>
diff --git a/symbols/Einheiten/Trupp.j2 b/symbols/Einheiten/Trupp.j2
@@ -1,11 +1,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Trupp</title>
-	<defs>
-		<clipPath id="symbol">
-			<rect x="10" y="64" width="236" height="128" />
-		</clipPath>
-	</defs>
-	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
+	<rect x="10" y="64" width="236" height="128" stroke="none" fill="#000000" />
+	<rect x="15" y="69" width="226" height="118" stroke="none" fill="#FFFFFF" />
 	<ellipse cx="128" cy="48" rx="10" ry="10" fill="#000000" />
-</svg>
+</svg>
diff --git a/symbols/Einheiten/Zug.j2 b/symbols/Einheiten/Zug.j2
@@ -1,13 +1,9 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Zug</title>
-	<defs>
-		<clipPath id="symbol">
-			<rect x="10" y="64" width="236" height="128" />
-		</clipPath>
-	</defs>
-	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
+	<rect x="10" y="64" width="236" height="128" stroke="none" fill="#000000" />
+	<rect x="15" y="69" width="226" height="118" stroke="none" fill="#FFFFFF" />
 	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="#000000" />
 	<ellipse cx="128" cy="48" rx="10" ry="10" fill="#000000" />
 	<ellipse cx="192" cy="48" rx="10" ry="10" fill="#000000" />
-</svg>
+</svg>
diff --git a/symbols/Einrichtungen/Behandlungsplatz.j2 b/symbols/Einrichtungen/Behandlungsplatz.j2
@@ -1,11 +1,6 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Behandlungsplatz</title>
-	<defs>
-		<clipPath id="base">
-			<ellipse cx="128" cy="128" rx="64" ry="64" />
-		</clipPath>
-	</defs>
 	<ellipse fill="#FFFFFF" stroke="#000000" stroke-width="5" cx="128" cy="128" rx="64" ry="64" />
 	<path d="M128,64 l0,128 M64,128 l128,0" stroke="#000000" stroke-width="5" fill="none" />
-</svg>
+</svg>
diff --git a/symbols/Einrichtungen/Belegungsstelle.j2 b/symbols/Einrichtungen/Belegungsstelle.j2
diff --git a/symbols/Einrichtungen/Bereitstellungsraum.j2 b/symbols/Einrichtungen/Bereitstellungsraum.j2
@@ -1,11 +1,6 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Bereitstellungsraum</title>
-	<defs>
-		<clipPath id="base">
-			<ellipse cx="128" cy="128" rx="64" ry="64" />
-		</clipPath>
-	</defs>
 	<ellipse fill="#FFFF00" stroke="#000000" stroke-width="5" cx="128" cy="128" rx="64" ry="64" />
 	<path d="M85,105 L85,151 L171,151 L171,105 Q128,128 85,105 Z" stroke="#000000" stroke-width="5" fill="none" />
-</svg>
+</svg>
diff --git a/symbols/Einrichtungen/Bereitstellungsraum_mit_Führungsstelle.j2 b/symbols/Einrichtungen/Bereitstellungsraum_mit_Führungsstelle.j2
@@ -1,14 +1,9 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Bereitstellungsraum mit Führungsstelle</title>
-	<defs>
-		<clipPath id="base">
-			<ellipse cx="128" cy="128" rx="64" ry="64" />
-		</clipPath>
-	</defs>
 	<ellipse fill="#FFFF00" stroke="#000000" stroke-width="5" cx="128" cy="128" rx="64" ry="64" />
 	<path d="M85,105 L85,151 L171,151 L171,105 Q128,128 85,105 Z" stroke="#000000" stroke-width="5" fill="none" />
 	<rect x="111" y="80" width="34" height="18" fill="none" stroke="#000000" stroke-width="2" />
 	<line x1="111" y1="98" x2="111" y2="108" stroke="#000000" stroke-width="2" />
 	<path d="M85,105 L85,151 L171,151 L171,105 Q128,128 85,105 Z" stroke="#000000" stroke-width="3" fill="none" />
-</svg>
+</svg>
diff --git a/symbols/Einrichtungen/Bereitstellungsraum_mit_Führungsstelle_THW.j2 b/symbols/Einrichtungen/Bereitstellungsraum_mit_Führungsstelle_THW.j2
@@ -0,0 +1,10 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
+	<title>Bereitstellungsraum mit Führungsstelle THW</title>
+	<ellipse fill="#FFFF00" stroke="#000000" stroke-width="5" cx="128" cy="128" rx="64" ry="64" />
+	<path d="M85,105 L85,151 L171,151 L171,105 Q128,128 85,105 Z" stroke="#000000" stroke-width="5" fill="none" />
+	<rect x="111" y="80" width="34" height="18" fill="none" stroke="#000000" stroke-width="2" />
+	<line x1="111" y1="98" x2="111" y2="108" stroke="#000000" stroke-width="2" />
+	<path d="M85,105 L85,151 L171,151 L171,105 Q128,128 85,105 Z" stroke="#000000" stroke-width="3" fill="none" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 24px; text-anchor: middle;" x="206" y="196">THW</text>
+</svg>
diff --git a/symbols/Einrichtungen/Bereitstellungsraum_mit_Meldekopf.j2 b/symbols/Einrichtungen/Bereitstellungsraum_mit_Meldekopf.j2
@@ -5,11 +5,8 @@
 		<style type="text/css">
 			{% include './fonts/fonts.j2' %}
 		</style>
-		<clipPath id="base">
-			<ellipse cx="128" cy="128" rx="64" ry="64" />
-		</clipPath>
 	</defs>
 	<ellipse fill="#FFFF00" stroke="#000000" stroke-width="5" cx="128" cy="128" rx="64" ry="64" />
 	<path d="M85,105 L85,151 L171,151 L171,105 Q128,128 85,105 Z" stroke="#000000" stroke-width="5" fill="none" />
 	<text style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 40px; text-anchor: middle;" x="128" y="105">M</text>
-</svg>
+</svg>
diff --git a/symbols/Einrichtungen/Betreuungsstelle.j2 b/symbols/Einrichtungen/Betreuungsstelle.j2
@@ -1,12 +1,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Betreuungsstelle</title>
-	<defs>
-		<clipPath id="base">
-			<ellipse cx="128" cy="128" rx="64" ry="64" />
-		</clipPath>
-	</defs>
 	<ellipse fill="#FFFFFF" stroke="#000000" stroke-width="5" cx="128" cy="128" rx="64" ry="64" />
 	<path d="M10 80 L128 48 L246 80" stroke-width="5" stroke="#000000" fill="none" />
-	<path d="M128,64 l64,128 M128,64 l-64,128" stroke="#000000" stroke-width="5" fill="none" clip-path="url(#base)" />
-</svg>
+	<path d="M128,64 l51,102 M128,64 l-51,102" stroke="#000000" stroke-width="5" fill="none"/>
+</svg>
diff --git a/symbols/Einrichtungen/Entsorgungsstelle.j2 b/symbols/Einrichtungen/Entsorgungsstelle.j2
@@ -5,11 +5,8 @@
 		<style type="text/css">
 			{% include './fonts/fonts.j2' %}
 		</style>
-		<clipPath id="base">
-			<ellipse cx="128" cy="128" rx="64" ry="64" />
-		</clipPath>
 	</defs>
-    <circle fill="#FFFFFF" stroke="#000000" stroke-width="5" cx="128" cy="128" r="64"/>
-    <text font-size="72" fill="#000000" x='102' y="150" >A</text>
-    <text style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 32px; text-anchor: middle;" x="128" y="220">Entsorgung</text>
-</svg>
+	<circle fill="#FFFFFF" stroke="#000000" stroke-width="5" cx="128" cy="128" r="64"/>
+	<text font-size="72" fill="#000000" x='102' y="150" >A</text>
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 32px; text-anchor: middle;" x="128" y="220">Entsorgung</text>
+</svg>
diff --git a/symbols/Einrichtungen/Feldlager.j2 b/symbols/Einrichtungen/Feldlager.j2
@@ -5,10 +5,7 @@
 		<style type="text/css">
 		{% include './fonts/fonts.j2' %}
 		</style>
-		<clipPath id="base">
-			<ellipse cx="128" cy="128" rx="64" ry="64" />
-		</clipPath>
 	</defs>
 	<ellipse fill="#FFFFFF" stroke="#000000" stroke-width="5" cx="128" cy="128" rx="64" ry="64" />
-	<text style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 48px; text-anchor: middle;" x="128" y="145">FLgr</text>
-</svg>
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 42px; text-anchor: middle;" x="128" y="144">FLgr</text>
+</svg>
diff --git a/symbols/Einrichtungen/Halteplatz_für_Fahrzeuge_zum_Verletztentransport.j2 b/symbols/Einrichtungen/Halteplatz_für_Fahrzeuge_zum_Verletztentransport.j2
@@ -1,13 +1,8 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Halteplatz für Fahrzeuge zum Verletztentransport</title>
-	<defs>
-		<clipPath id="base">
-			<ellipse cx="128" cy="128" rx="64" ry="64" />
-		</clipPath>
-	</defs>
 	<ellipse fill="#FFFFFF" stroke="#000000" stroke-width="5" cx="128" cy="128" rx="64" ry="64" />
 	<path d="M128,64 l0,128 M64,128 l128,0" stroke="#000000" stroke-width="5" fill="none" />
 	<ellipse cx="128" cy="128" rx="32" ry="32" fill="none" stroke-width="5" stroke="#000000" />
 	<path d="M128,128 l32,0 l-64,0 m32,0 l0,32 l0,-64" fill="none" stroke-width="5" stroke="#000000" transform="rotate(45,128,128)" />
-</svg>
+</svg>
diff --git a/symbols/Einrichtungen/Hubschrauberlandeplatz.j2 b/symbols/Einrichtungen/Hubschrauberlandeplatz.j2
@@ -1,13 +1,8 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Hubschrauberlandeplatz</title>
-	<defs>
-		<clipPath id="base">
-			<ellipse cx="128" cy="128" rx="64" ry="64" />
-		</clipPath>
-	</defs>
 	<ellipse fill="#FFFF00" stroke="#000000" stroke-width="5" cx="128" cy="128" rx="64" ry="64" />
 	<path d="M110,162 l36,0 M128,162 l0,-54" stroke="#000000" stroke-width="5" fill="none" />
 	<path d="M128,108 a5,5 90 0 1 5,-5 l32,0 a5,5 180 0 1 0,10 l-32,0 a5,5 90 0 1 -5,-5 Z" stroke="#000000" stroke-width="5" fill="none" />
 	<path d="M128,108 a5,5 90 0 0 -5,-5 l-32,0 a5,5 180 0 0 0,10 l32,0 a5,5 90 0 0 5,-5 Z" stroke="#000000" stroke-width="5" fill="none" />
-</svg>
+</svg>