Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fernmeldewesen, Maßnahmen, Schadenskonten #152

Closed
wants to merge 191 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
191 commits
Select commit Hold shift + click to select a range
aaeb268
Maßnahme: Retten aus Höhen und Tiefen
Daugl Jan 17, 2021
7e3d947
Maßnahme: Brandbekämpfung
Daugl Jan 17, 2021
51d4c36
Maßnahme: Wasserversorgung
Daugl Jan 17, 2021
95ab4fc
Maßnahme:Technische Hilfeleistung
Daugl Jan 17, 2021
17f681d
Maßnahme: Heben
Daugl Jan 17, 2021
3ce0cdd
Maßnahme: Bergen
Daugl Jan 17, 2021
b00cb16
Maßnahme: Kampfmittelräumung
Daugl Jan 17, 2021
4015808
Maßnahme: Beleuchtung
Daugl Jan 17, 2021
8360b67
Maßnahme: Luftfahrzeuge
Daugl Jan 17, 2021
68e3feb
Maßnahme: Wasserfahrzeuge
Daugl Jan 17, 2021
61bde07
Update Wasserfahrzeuge.j2
Daugl Jan 17, 2021
40fc8bf
Maßnahme: Suchen & Orten
Daugl Jan 17, 2021
064c3c1
Maßnahme: Wasserrettung
Daugl Jan 17, 2021
fbecc4a
Maßnahme: Pumpen
Daugl Jan 17, 2021
e3fa269
Maßnahme: Deichverteidigung
Daugl Jan 17, 2021
822a8a9
Maßnahme: ABC-Abwehr
Daugl Jan 17, 2021
6004288
Maßnahme: Messen
Daugl Jan 17, 2021
c4f67bf
Maßnahme: Sandsack füllen
Daugl Jan 18, 2021
895f6dd
Maßnahme: Lotsen
Daugl Feb 21, 2021
e4c628e
Merge branch 'jonas-koeritz:master' into Maßnahmen
Daugl May 20, 2021
800938a
Update Lotsen.j2
Daugl May 20, 2021
7ec2c81
Bedingszeichen angepasst
Daugl May 20, 2021
316ebb7
Update Bedingung_AWITEL.j2
Daugl May 20, 2021
3bfe948
Neue Bedingungszeichen
Daugl May 20, 2021
6f8221c
Neue Netzübergänge
Daugl May 20, 2021
0497b99
Fernmeldewesen - Einrichtungen
Daugl May 20, 2021
2935752
Neue Zeichen - Fernmeldewesen, div.
Daugl May 20, 2021
218bb20
Merge branch 'jonas-koeritz:master' into Fernmeldewesen---Einrichtungen
Daugl May 23, 2021
bd152db
Update Vermittlung_Stelle.j2
Daugl May 23, 2021
71f5600
Update Relaisfunk_Stelle.j2
Daugl May 23, 2021
024e4d5
Update Fernsprech_Stelle.j2
Daugl May 23, 2021
fc9958a
Update Fernmelde_Stelle.j2
Daugl May 23, 2021
b44c588
Update Bildübertragung.j2
Daugl May 23, 2021
352ba07
Update Bildübertragung_Funk.j2
Daugl May 23, 2021
6c7243c
Update Fernschreiben_über_Draht.j2
Daugl May 23, 2021
c9fe82c
Update Fernschreiben_über_Funk.j2
Daugl May 23, 2021
a314e3e
Update Festbildübertragung_Draht.j2
Daugl May 23, 2021
4c7ee9a
Update Festbildübertragung_Funk.j2
Daugl May 23, 2021
99fc671
Update Leitung_Aufgelegt.j2
Daugl May 23, 2021
2be2dc7
Update Leitung_Aufgeschaltet.j2
Daugl May 23, 2021
86bf739
Update Leitung_Durchgeschaltet.j2
Daugl May 23, 2021
83d21c7
Update Leitung_Freigeschaltet.j2
Daugl May 23, 2021
4056308
Update Tasten_über_Draht.j2
Daugl May 23, 2021
a541e45
Update Tasten_über_Funk.j2
Daugl May 23, 2021
87e1805
Update Gateway.j2
Daugl May 23, 2021
1cfd8ff
Update Gateway_Repeater.j2
Daugl May 23, 2021
b3b5c3f
Update IP-ISDN.j2
Daugl May 23, 2021
75f06ee
Update IP-analog.j2
Daugl May 23, 2021
5948926
Update Modem_DSL.j2
Daugl May 23, 2021
c20746c
Update Modem_DSL_WLAN.j2
Daugl May 23, 2021
ec7b8fc
Update WLAN_Access_Point.j2
Daugl May 23, 2021
7c19d9c
Update WLAN_Access_Point.j2
Daugl May 23, 2021
47b6ec8
Update Gateway_Repeater.j2
Daugl May 23, 2021
4b4a92b
Update IP-ISDN.j2
Daugl May 23, 2021
cc75005
Update IP-analog.j2
Daugl May 23, 2021
a1c737e
Update Modem_DSL.j2
Daugl May 23, 2021
69f6d62
Update Modem_DSL_WLAN.j2
Daugl May 23, 2021
11bcb0b
Update Bedingung_DMO.j2
Daugl May 23, 2021
d5887ec
Update Bedingung_Sprechfunk.j2
Daugl May 23, 2021
1a4445c
Update Bedingung_Sprechfunk_Gateway.j2
Daugl May 23, 2021
020fecb
Update Bedingung_Sprechfunk_RS1.j2
Daugl May 23, 2021
dc56a06
Update Bedingung_Sprechfunk_RS2.j2
Daugl May 23, 2021
13c1527
Update Bedingung_Sprechfunk_Repeater.j2
Daugl May 23, 2021
b31454c
Update Bedingung_Sprechfunk_Repeater_Gateway.j2
Daugl May 23, 2021
e40c96f
Update Lotsen.j2
Daugl May 23, 2021
5395ba7
Update ABC-Abwehr.j2
Daugl May 23, 2021
bf28db6
Update Beleuchtung.j2
Daugl May 23, 2021
d7b205c
Update Brandbekämpfung.j2
Daugl May 23, 2021
9c3bdf3
Update Deichverteidigung.j2
Daugl May 23, 2021
cf16005
Update Heben.j2
Daugl May 23, 2021
e129530
Update Kampfmittelräumung.j2
Daugl May 23, 2021
275c8eb
Update Luftfahrzeuge.j2
Daugl May 23, 2021
1d032e9
Update Orten.j2
Daugl May 23, 2021
1da8b2c
Update Pumpen.j2
Daugl May 23, 2021
ba58962
Update Retten_Höhen_Tiefen.j2
Daugl May 23, 2021
d6ba51f
Update Sandsack_füllen.j2
Daugl May 23, 2021
d441dc0
Update Technische_Hilfeleistung.j2
Daugl May 23, 2021
33eec0d
Update Wasserfahrzeuge.j2
Daugl May 23, 2021
df6fa00
Update Wasserrettung.j2
Daugl May 23, 2021
eaa7ed8
Update Wasserversorgung.j2
Daugl May 23, 2021
9caa1da
Delete Retten_Höhen_Tiefen.j2
Daugl May 24, 2021
4e40364
Rename Fernmelde_Stelle.j2 to Fernmeldestelle.j2
Daugl Jul 6, 2021
0fed576
Rename Fernsprech_Stelle.j2 to Fernsprechstelle.j2
Daugl Jul 6, 2021
84b7fa7
Rename Relaisfunk_Stelle.j2 to Relaisfunkstelle.j2
Daugl Jul 6, 2021
2be3a44
Rename Vermittlung_Stelle.j2 to Vermittlungsstelle.j2
Daugl Jul 6, 2021
637b62f
Merge branch 'jonas-koeritz:master' into Fernmeldewesen-Bedingungen
Daugl Jul 9, 2021
7ed41b7
Merge branch 'jonas-koeritz:master' into Fernmeldewesen---Einrichtungen
Daugl Jul 9, 2021
89b423e
Merge branch 'jonas-koeritz:master' into Fernmeldewesen-Netzübergänge
Daugl Jul 9, 2021
102a5b5
Merge branch 'jonas-koeritz:master' into Fernmeldwesen-Sonstiges
Daugl Jul 9, 2021
1a84edb
Merge branch 'jonas-koeritz:master' into Maßnahmen
Daugl Jul 9, 2021
55985e2
Merge pull request #6 from Daugl/Fernmeldewesen---Einrichtungen
Daugl Jul 29, 2021
162f070
Merge pull request #7 from Daugl/Fernmeldewesen-Bedingungen
Daugl Jul 29, 2021
03a2ed5
Merge pull request #8 from Daugl/Fernmeldewesen-Netzübergänge
Daugl Jul 29, 2021
ee61397
Merge pull request #9 from Daugl/Fernmeldwesen-Sonstiges
Daugl Jul 29, 2021
8ec747e
Merge pull request #10 from Daugl/Maßnahmen
Daugl Jul 29, 2021
fe36234
Delete Messen.j2
Daugl Jul 29, 2021
b20f2ec
Add files via upload
Daugl Jul 29, 2021
0dac641
Merge branch 'all' into master
Daugl Dec 16, 2021
49bd875
Merge pull request #11 from Daugl/master
Daugl Dec 16, 2021
6ecb977
Merge branch 'jonas-koeritz:master' into master
Daugl Mar 20, 2022
67fabf1
Merge branch 'jonas-koeritz:master' into Fernmeldewesen---Einrichtungen
Daugl Mar 20, 2022
2805e47
Merge pull request #13 from Daugl/Fernmeldewesen---Einrichtungen
Daugl Mar 20, 2022
145a7c5
Merge branch 'jonas-koeritz:master' into all
Daugl Mar 20, 2022
981686f
Merge pull request #14 from Daugl/all
Daugl Mar 20, 2022
0e4400d
Merge branch 'jonas-koeritz:master' into Maßnahmen
Daugl Mar 20, 2022
52d25ee
Merge branch 'master' into Maßnahmen
Daugl Mar 20, 2022
db21d39
Merge pull request #15 from Daugl/Maßnahmen
Daugl Mar 20, 2022
2100298
Fax in eine Datenanwendung geändert
Daugl Mar 20, 2022
b0a26a8
AWINAP Korrektur: Analoge Telefonanschluss
Daugl Mar 20, 2022
04f9b8d
Neue Netzübergänge: GSM auf ISDN und POTS, sowie ISDN auf POTS
Daugl Mar 20, 2022
cf8a329
Title Tag im Fernmeldewesen hinzugefügt
Daugl Mar 20, 2022
1a9cddf
Title Tag bei Maßnahmen hinzugefügt
Daugl Mar 20, 2022
30a11af
Title Tag bei Schadenskonten und -stellen hinzugefügt
Daugl Mar 20, 2022
08b11e9
XML Tag im Fernmeldewesen entfernt
Daugl Mar 20, 2022
79cee57
Neue Bedingungen: DECT, Mobil, E-Mail
Daugl Mar 20, 2022
d1a16e6
Umbennenung & Vereinheitlichung. Analog -> POTS, Wegfall von 'Über Dr…
Daugl Mar 20, 2022
4d96d1b
Umbennenung & Vereinheitlichung. Analog -> POTS, Wegfall von 'Über Dr…
Daugl Mar 20, 2022
a00f3a9
Einzelnen Amtszusatz für die OB Vermittlung hinzugefügt
Daugl Mar 20, 2022
7631fb0
Fehlende Viewboxes ergänzt
Daugl Mar 20, 2022
6c48d8e
Merge branch 'jonas-koeritz:master' into master
Daugl Sep 13, 2022
8440d60
Merge branch 'jonas-koeritz:master' into master
Daugl Jan 31, 2023
5f58c61
initial push
Daugl Feb 5, 2023
6fa8e52
Ergänzung & Korrektur Einheiten Verband FLgr
Daugl Feb 5, 2023
7b69543
Ergänzung Fachzug FK im Verband FLgr
Daugl Feb 6, 2023
dfd90bd
Korrektur Typo, hinzufügen Gruppe LogV mit Aufgabe Zubereitung
Daugl Feb 6, 2023
5d1ea46
Korrektur Typo, hinzufügen Gruppe LogV mit Aufgabe Zubereitung
Daugl Feb 6, 2023
3549cea
Ergänzung Zeichen Verband Logistik - Bereich LogV
Daugl Feb 6, 2023
8c569e0
Ergänzung Zeichen Verband Logistik - Bereich LogM
Daugl Feb 6, 2023
12ddb0c
Ergänzung Zeichen Verband Logistik - Bereich LogVG
Daugl Feb 6, 2023
8bdd638
Ergänzung Zeichen Verband Logistik - Bereich Ustg
Daugl Feb 6, 2023
d3e9a7c
Ergänzung Zeichen Verband Logistik - Trupp I E-Netz
Daugl Feb 6, 2023
42a1568
Korrektur title Verband Logistik - Trupp E E-Netz
Daugl Feb 6, 2023
88b98b0
Umbennung Wasserversorgung -> Löschwasserversorgung
Daugl Feb 6, 2023
37ab36c
Umbennung Wasserversorgung -> Löschwasserversorgung
Daugl Feb 6, 2023
3271ed6
Maßnahme Wasserentsorgung hinzugefügt
Daugl Feb 6, 2023
21f5665
Maßnahme Trinkwasserversorgung hinzugefügt
Daugl Feb 6, 2023
2b7e322
Einrichtung Verpflegunsstelle hinzugefügt
Daugl Feb 6, 2023
2298282
Einrichtung Verpflegunsstelle Varianten hinzugefügt
Daugl Feb 6, 2023
9bdc62e
Trinkwasserversorgungsstelle aktualisiert
Daugl Feb 6, 2023
358ad8f
ClipPath aus Polizei Fahrzeugen entfernt
Daugl Feb 6, 2023
9c7f3b9
ClipPath aus Einrichtungen entfernt
Daugl Feb 6, 2023
cbf1c7c
ClipPath aus den Fahrezugen der Feuerwehr entfernt
Daugl Feb 7, 2023
d78a4cc
ClipPath aus den Einheiten des Rettungswesen entfernt
Daugl Feb 7, 2023
e34021d
ClipPath aus den Einheiten der Feuerwehr entfernt
Daugl Feb 7, 2023
da9a4ef
Fahrzeuge der Feuerwehr vereinheitlicht (Rand, Form, Maße)
Daugl Feb 7, 2023
13b5a24
Fahrzeuge der Polizei vereinheitlicht (Rand, Form, Maße)
Daugl Feb 7, 2023
a9ff52d
Fahrzeuge des THW vereinheitlicht (Rand, Form, Maße, Schrift)
Daugl Mar 1, 2023
81f5109
Fahrzeuge des Rettungsdienstes vereinheitlicht (Rand, Form, Maße, Sch…
Daugl Mar 11, 2023
7366340
Kommunalfahrzeuge vereinheitlicht (Rand, Form, Maße, Schrift)
Daugl Mar 11, 2023
190175b
Allgemeine Fahrzeuge vereinheitlicht (Rand, Form, Maße, Schrift)
Daugl Mar 11, 2023
24b7994
Fahrzeuge der Bundeswehr und des Zolls vereinheitlicht (Rand, Form, M…
Daugl Mar 11, 2023
3f84179
stroke-width=none in stroke=none geändert
Daugl Mar 11, 2023
2ffd2eb
ClipPath aus Einheiten des Katastrophenschutzes entfernt
Daugl Mar 11, 2023
24b9465
ClipPath aus Einheiten des Zolls entfernt
Daugl Mar 11, 2023
5ab9b11
ClipPath aus den allgemeinen Einheiten entfernt
Daugl Mar 11, 2023
4c0a888
BR_Stab entfernt, identischt mit Stab
Daugl Mar 11, 2023
bb4abf6
ClipPath aus den Einheiten des THW entfernt
Daugl Mar 12, 2023
f1e326f
Gruppenführer THW Dateiendung umbenannt .j2 -> .j2t
Daugl Mar 14, 2023
771fcb4
Initial commit
Daugl Apr 29, 2023
252c0b6
Initial commit
Daugl Apr 30, 2023
369f9cb
Merge branch 'jonas-koeritz:master' into master
Daugl Jun 26, 2024
e86a53e
Solved merge conflict
Daugl Jul 6, 2024
a907a91
Merge pull request #23 from Daugl/templates
Daugl Jul 6, 2024
dbfd0cf
Test Dateien entfernt
Daugl Jul 6, 2024
d82f1c5
Template für Anhänger hinzugefügt
Daugl Jul 6, 2024
cdc8da8
Template für Anhänger hinzugefügt
Daugl Jul 6, 2024
a8a6831
Nichts zu sehen
Daugl Jul 6, 2024
40bc740
Template für Einheiten hinzugefügt
Daugl Jul 6, 2024
1f7f6c7
Template für Gebäude hinzugefügt
Daugl Jul 6, 2024
f2c7091
Titel im Base-Templeta bereinigt
Daugl Jul 6, 2024
e54d480
Größenordnungen im Template für Einheiten hinzugefügt
Daugl Jul 6, 2024
aa39d5c
Template für Anhänger in Fahrzeug Template integriert
Daugl Jul 6, 2024
97eb815
Obsoletes Template entfernt
Daugl Jul 6, 2024
1d36f44
Diverse Fahrzeugtypen hinzugefügt
Daugl Jul 6, 2024
8ce6ab3
Umbenennung Größenordnung
Daugl Jul 6, 2024
ec6b31e
Undefined Farbschema hinzugefügt
Daugl Jul 8, 2024
42f5754
Whitespace Handling
Daugl Jul 8, 2024
e6771f1
Whitespace Handling & Farbschema für Organisationen
Daugl Jul 8, 2024
4ac6303
Undefinierte Variable Handling
Daugl Jul 8, 2024
4bc2f29
Template für Personen erstellt
Daugl Jul 8, 2024
ae6c84d
Typo fixed
Daugl Jul 8, 2024
b3ed496
Balken für Führungs- und Logistikeinheiten; Zugtrupp-option
Daugl Jul 8, 2024
b360c2f
Org undefined als default
Daugl Jul 8, 2024
0f9d126
Redundante Werte für stroke entfernt
Daugl Jul 8, 2024
a650fc2
Template für Stellen / Einrichtungen hinzugefügt
Daugl Jul 9, 2024
c9df17a
Person einer Führungseinrichtung hinzugefügt
Daugl Jul 9, 2024
09df5db
Default Wert für Organisation
Daugl Jul 9, 2024
5c707ce
Schienenfahrzeug hinzugefügt, Default Wert für Organisation
Daugl Jul 9, 2024
69fe1ce
Template für Gefahren hinzugefügt
Daugl Jul 9, 2024
6a2ccd8
Template für Maßnahmen hinzugefügt
Daugl Jul 9, 2024
bcfa79c
Template für Fernmelde-Endgeräte hinzugefügt
Daugl Jul 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ Taktische-Zeichen.zip
web
test
release.zip
symbols/_test
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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/%=%)
Expand All @@ -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 $@

Expand Down
14 changes: 10 additions & 4 deletions symbols/Bundeswehr_Fahrzeuge/Kettenfahrzeug.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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
15 changes: 11 additions & 4 deletions symbols/Bundeswehr_Fahrzeuge/Kraftfahrzeug.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 12 additions & 4 deletions symbols/Bundeswehr_Fahrzeuge/Kraftfahrzeug_geländegängig.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 3 additions & 8 deletions symbols/Einheiten/Führungsgruppe.j2
Original file line number Diff line number Diff line change
@@ -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>
11 changes: 3 additions & 8 deletions symbols/Einheiten/Führungsstaffel.j2
Original file line number Diff line number Diff line change
@@ -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>
11 changes: 3 additions & 8 deletions symbols/Einheiten/Führungstrupp.j2
Original file line number Diff line number Diff line change
@@ -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>
10 changes: 3 additions & 7 deletions symbols/Einheiten/Gruppe.j2
Original file line number Diff line number Diff line change
@@ -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>
10 changes: 3 additions & 7 deletions symbols/Einheiten/Staffel.j2
Original file line number Diff line number Diff line change
@@ -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>
10 changes: 3 additions & 7 deletions symbols/Einheiten/Trupp.j2
Original file line number Diff line number Diff line change
@@ -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>
10 changes: 3 additions & 7 deletions symbols/Einheiten/Zug.j2
Original file line number Diff line number Diff line change
@@ -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>
7 changes: 1 addition & 6 deletions symbols/Einrichtungen/Behandlungsplatz.j2
Original file line number Diff line number Diff line change
@@ -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>
17 changes: 0 additions & 17 deletions symbols/Einrichtungen/Belegungsstelle.j2

This file was deleted.

7 changes: 1 addition & 6 deletions symbols/Einrichtungen/Bereitstellungsraum.j2
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
@@ -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>
5 changes: 1 addition & 4 deletions symbols/Einrichtungen/Bereitstellungsraum_mit_Meldekopf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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>
9 changes: 2 additions & 7 deletions symbols/Einrichtungen/Betreuungsstelle.j2
Original file line number Diff line number Diff line change
@@ -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>
11 changes: 4 additions & 7 deletions symbols/Einrichtungen/Entsorgungsstelle.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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>
7 changes: 2 additions & 5 deletions symbols/Einrichtungen/Feldlager.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
@@ -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>
7 changes: 1 addition & 6 deletions symbols/Einrichtungen/Hubschrauberlandeplatz.j2
Original file line number Diff line number Diff line change
@@ -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>
Loading
Loading