From 4e33d0dfb4d68fa369e41d7cf53b5f60082491ba Mon Sep 17 00:00:00 2001 From: Lukas Winkler Date: Thu, 15 Dec 2022 17:58:42 +0100 Subject: [PATCH] add missing crossing from official data --- assets/favicons/facebook.svg | 8 ++++ commands/fetch.ts | 2 +- data/Burgenland.json | 2 +- data/Kärnten.json | 2 +- data/Niederösterreich.json | 2 +- data/Oberösterreich.json | 2 +- data/Steiermark.json | 2 +- data/Tirol.json | 2 +- data/Vorarlberg.json | 2 +- data/Wien.json | 90 ++++++++++++++++++++++++++++++++++-- data/schema.json | 4 ++ interfaces.ts | 1 + missing.md | 2 + src/favicon.ts | 3 ++ src/text.ts | 7 ++- 15 files changed, 116 insertions(+), 15 deletions(-) create mode 100644 assets/favicons/facebook.svg diff --git a/assets/favicons/facebook.svg b/assets/favicons/facebook.svg new file mode 100644 index 0000000..881fb95 --- /dev/null +++ b/assets/favicons/facebook.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/commands/fetch.ts b/commands/fetch.ts index 0d567ff..336ed3f 100644 --- a/commands/fetch.ts +++ b/commands/fetch.ts @@ -80,7 +80,7 @@ async function runfetch(filename: string) { // crossings[i] = d fs.writeFileSync(filename, JSON.stringify(data, null, 2)) } - fs.writeFileSync(filename, JSON.stringify(data, null, 2)) + fs.writeFileSync(filename, JSON.stringify(data, null, 2).concat('\n')) } diff --git a/data/Burgenland.json b/data/Burgenland.json index 3a7e06f..5e980a7 100644 --- a/data/Burgenland.json +++ b/data/Burgenland.json @@ -76,4 +76,4 @@ "length": 9.69 } } -] \ No newline at end of file +] diff --git a/data/Kärnten.json b/data/Kärnten.json index d174993..07ac49d 100644 --- a/data/Kärnten.json +++ b/data/Kärnten.json @@ -173,4 +173,4 @@ "length": 13.54 } } -] \ No newline at end of file +] diff --git a/data/Niederösterreich.json b/data/Niederösterreich.json index 3348fad..eedb066 100644 --- a/data/Niederösterreich.json +++ b/data/Niederösterreich.json @@ -91,4 +91,4 @@ "length": 8.62 } } -] \ No newline at end of file +] diff --git a/data/Oberösterreich.json b/data/Oberösterreich.json index dd2ede7..baf205e 100644 --- a/data/Oberösterreich.json +++ b/data/Oberösterreich.json @@ -200,4 +200,4 @@ "length": 17.09 } } -] \ No newline at end of file +] diff --git a/data/Steiermark.json b/data/Steiermark.json index 3595a64..1cbc3ae 100644 --- a/data/Steiermark.json +++ b/data/Steiermark.json @@ -48,4 +48,4 @@ "length": 16.48 } } -] \ No newline at end of file +] diff --git a/data/Tirol.json b/data/Tirol.json index 8a1b30c..57fce5c 100644 --- a/data/Tirol.json +++ b/data/Tirol.json @@ -48,4 +48,4 @@ "length": 4.99 } } -] \ No newline at end of file +] diff --git a/data/Vorarlberg.json b/data/Vorarlberg.json index df63e7a..ed5455a 100644 --- a/data/Vorarlberg.json +++ b/data/Vorarlberg.json @@ -42,4 +42,4 @@ "length": 7.57 } } -] \ No newline at end of file +] diff --git a/data/Wien.json b/data/Wien.json index f185ab4..36f57c1 100644 --- a/data/Wien.json +++ b/data/Wien.json @@ -2,6 +2,9 @@ { "id": 1740508417, "name": "Praterstern", + "officialName": "Praterstern # Ausstellungsstraße", + "bezirk": 2, + "type": "prideFlag", "sources": [ { "type": "streetview", @@ -13,8 +16,6 @@ "url": "https://www.meinbezirk.at/leopoldstadt/c-lokales/neuer-regenbogen-zebrastreifen-am-praterstern_a4591199" } ], - "bezirk": 2, - "type": "prideFlag", "geosource": { "type": "OSMway", "wayID": 191209754 @@ -38,6 +39,7 @@ "name": "Spitalgasse/Lazarettgasse", "bezirk": 9, "type": "transFlag", + "officialName": "Spitalgasse # Lazarettgasse", "sources": [ { "type": "news", @@ -77,6 +79,7 @@ "bezirk": 6, "type": "prideFlag", "comment": "dritte in Wien", + "officialName": "Gumpendorfer Straße # Kaunitzgasse", "sources": [ { "type": "official", @@ -111,6 +114,7 @@ "name": "Schönbrunner Straße/Pilgramgasse", "bezirk": 5, "type": "prideFlag", + "officialName": "Pilgramgasse # Schönbrunner Straße", "sources": [ { "type": "official", @@ -147,6 +151,7 @@ "bezirk": 1, "type": "prideFlag", "comment": "erster in Wien", + "officialName": "Universitätsring vor Burgtheater", "sources": [ { "type": "news", @@ -182,6 +187,7 @@ "name": "Meidlinger Markt", "bezirk": 12, "type": "prideFlag", + "officialName": "Niederhofstraße # Ignazgasse", "sources": [ { "type": "news", @@ -221,6 +227,7 @@ "name": "Laaer-Berg-Straße", "bezirk": 10, "type": "prideFlag", + "officialName": "Laaer-Berg-Straße 170", "sources": [ { "type": "news", @@ -267,6 +274,7 @@ "bezirk": 18, "type": "prideFlag", "comment": "Zweiter in Wien", + "officialName": "Währinger Straße 108", "sources": [ { "type": "news", @@ -305,6 +313,7 @@ "name": "Landstraßer Hauptstraße", "bezirk": 3, "type": "prideFlag", + "officialName": "Landstraßer Hauptstraße # Beatrixgasse", "sources": [ { "type": "news", @@ -336,6 +345,7 @@ "name": "Operngasse/Schleifmühlgasse", "bezirk": 4, "type": "prideFlag", + "officialName": "Operngasse # Schleifmühlgasse", "sources": [ { "type": "news", @@ -375,6 +385,7 @@ "name": "Schönbrunner Straße/Ramperstorffergasse", "bezirk": 5, "type": "transFlag", + "officialName": "Schönbrunner Straße # Ramperstorffergasse", "sources": [ { "type": "news", @@ -410,6 +421,7 @@ "name": "Kennedybrücke/Hietzinger Hauptstraße", "bezirk": 13, "type": "prideFlag", + "officialName": "Hietzinger Hauptstraße / Schönbrunner Straße", "sources": [ { "type": "news", @@ -444,6 +456,7 @@ "name": "Kennedybrücke/Hadikgasse", "bezirk": 14, "type": "prideFlag", + "officialName": "Hadikgasse # Nisselgasse", "sources": [ { "type": "streetview", @@ -477,6 +490,7 @@ "name": "Simmeringer Platz", "bezirk": 11, "type": "prideFlag", + "officialName": "Simmeringer Platz 1", "sources": [ { "type": "news", @@ -511,6 +525,7 @@ "name": "Mauer Hauptplatz", "bezirk": 23, "type": "prideFlag", + "officialName": "Maurer Hauptplatz", "sources": [ { "type": "news", @@ -545,6 +560,7 @@ "name": "Elterleinplatz/Kalvarienberggasse", "bezirk": 17, "type": "prideFlag", + "officialName": "Kalvarienberggasse # Elterleinplatz", "sources": [ { "type": "official", @@ -580,6 +596,7 @@ "bezirk": 3, "type": "prideFlag", "comment": "Zweiter im 3. Bezirk", + "officialName": "Rennweg 24", "sources": [ { "type": "news", @@ -617,8 +634,9 @@ { "id": 3932188971, "name": "Museumsquartier", - "bezirk": 1, + "bezirk": 7, "type": "prideFlag", + "officialName": "Mariahilfer Straße # Getreidemarkt / Museumsquartier", "comment": "Keine Informationen darüber, zwischen Juli 2019 und November 2020 gemalt", "sources": [ { @@ -655,6 +673,7 @@ "name": "Pilgrambrücke/Linke Wienzeile", "bezirk": 6, "type": "transFlag", + "officialName": "Pilgrambrücke", "sources": [ { "type": "proposal", @@ -691,6 +710,7 @@ "bezirk": 21, "type": "prideFlag", "set": "Floridsdorfer Spitz", + "officialName": "Am Spitz # Floridsdorfer Hauptstraße", "sources": [ { "type": "news", @@ -726,6 +746,7 @@ "bezirk": 21, "type": "prideFlag", "set": "Floridsdorfer Spitz", + "officialName": "Am Spitz # Floridsdorfer Hauptstraße", "sources": [ { "type": "news", @@ -761,6 +782,7 @@ "bezirk": 21, "type": "prideFlag", "set": "Floridsdorfer Spitz", + "officialName": "Am Spitz # Floridsdorfer Hauptstraße", "sources": [ { "type": "news", @@ -800,6 +822,7 @@ "name": "Josefstädter Straße/Albertgasse 1/3", "bezirk": 8, "type": "prideFlag", + "officialName": "Josef-Matthias-Hauer-Platz", "sources": [ { "type": "news", @@ -832,6 +855,7 @@ "bezirk": 8, "type": "transFlag", "comment": "Trans Pride Streifen sind eventuell neuer", + "officialName": "Josef-Matthias-Hauer-Platz", "sources": [ { "type": "news", @@ -863,6 +887,7 @@ "name": "Josefstädter Straße/Albertgasse 3/3", "bezirk": 8, "type": "transFlag", + "officialName": "Josefstädter Straße # Albertgasse", "comment": "Trans Pride Streifen sind eventuell neuer", "sources": [ { @@ -900,9 +925,10 @@ }, { "id": 1928064980, - "name": "Äußere Mariahilfer Straße", + "name": "Äußere Mariahilfer Straße/Palmgasse", "bezirk": 15, "type": "prideFlag", + "officialName": "Mariahilfer Straße # Palmgasse", "sources": [ { "type": "proposal", @@ -939,6 +965,7 @@ "name": "Mariahilfer Straße/Neubaugasse", "bezirk": 6, "type": "prideFlag", + "officialName": "Mariahilfer Straße # Amerlingstraße", "sources": [ { "type": "news", @@ -979,6 +1006,7 @@ "bezirk": 16, "type": "prideFlag", "set": "Thaliastraße/Brunnenstraße", + "officialName": "Thaliastraße # Brunnengasse", "sources": [ { "type": "news", @@ -1089,6 +1117,7 @@ "bezirk": 19, "type": "prideFlag", "set": "Peter-Jordan-Straße/Dänenstraße", + "officialName": "Peter-Jordan-Straße # Dänenstraße", "sources": [ { "type": "news", @@ -1217,6 +1246,7 @@ "name": "Billrothstraße/Gymnasiumstraße", "bezirk": 19, "type": "prideFlag", + "officialName": "Gymnasiumstraße / Billrothstraße", "sources": [ { "type": "official", @@ -1247,6 +1277,7 @@ "name": "Rauscherstraße/Wallensteinstraße", "bezirk": 20, "type": "prideFlag", + "officialName": "Wallensteinstraße # Rauscherstraße", "sources": [ { "type": "news", @@ -1284,6 +1315,7 @@ "name": "Winarskystraße/Dresdner Straße", "bezirk": 20, "type": "prideFlag", + "officialName": "Dresdnerstraße # Winarksystraße", "sources": [ { "type": "news", @@ -1314,6 +1346,7 @@ "name": "Pilgramgasse/Margaretenstraße", "bezirk": 5, "type": "prideFlag", + "officialName": "Margaretenplatz 44", "sources": [ { "type": "streetview", @@ -1349,6 +1382,7 @@ "bezirk": 22, "type": "prideFlag", "comment": "Erster im 22. Bezirk", + "officialName": "Schüttaustraße # Felix-Bischof-Weg", "sources": [ { "type": "photo", @@ -1384,6 +1418,7 @@ "name": "Lassallestraße", "bezirk": 2, "type": "prideFlag", + "officialName": "Lassallestraße # Radingergasse", "sources": [ { "type": "news", @@ -1424,6 +1459,7 @@ "name": "Burggasse/Museumsplatz", "bezirk": 7, "type": "transFlag", + "officialName": "Burggasse 1 / Museumstraße", "sources": [ { "type": "official", @@ -1459,5 +1495,49 @@ ], "length": 15.09 } + }, + { + "id": 4158395213, + "name": "Liesinger Platz", + "bezirk": 23, + "type": "transFlag", + "officialName": "Liesinger Platz 399", + "sources": [ + { + "type": "proposal", + "date": "2022-03-24", + "url": "https://www.wien.gv.at/bezirke/liesing/politik/sitzungen/pdf/antrag-20220324-22.pdf" + }, + { + "type": "proposal", + "date": "2022-03-24", + "url": "https://www.wien.gv.at/bezirke/liesing/politik/sitzungen/pdf/protokoll-20220324.pdf" + }, + { + "type": "news", + "date": "2022-11-06", + "url": "https://www.facebook.com/neos.liesing/posts/pfbid02odyuq6Y9Zp7mi28VWBbnRTn8XEqVcev7tv6XPw54dsdUEnSoQAFCcqTdFe5PpfnXl" + } + ], + "geosource": { + "type": "OSMnodes", + "nodes": [ + 2035248667, + 3558815420 + ] + }, + "geo": { + "coords": [ + [ + 16.282958, + 48.1352247 + ], + [ + 16.2831286, + 48.1353368 + ] + ], + "length": 17.77 + } } -] \ No newline at end of file +] diff --git a/data/schema.json b/data/schema.json index c8f2f34..1a96f9a 100644 --- a/data/schema.json +++ b/data/schema.json @@ -116,6 +116,10 @@ "comment": { "type": "string" }, + "officialName": { + "type": "string", + "description": "The name used in the documents by the City of Vienna" + }, "set": { "type": "string" }, diff --git a/interfaces.ts b/interfaces.ts index ebcfa5d..896d3c3 100644 --- a/interfaces.ts +++ b/interfaces.ts @@ -34,6 +34,7 @@ export interface Crossing { name: string bezirk?: number comment?: string + officialName?: string set?: string type: FlagType sources: Source[] diff --git a/missing.md b/missing.md index d7aee4c..d7751ad 100644 --- a/missing.md +++ b/missing.md @@ -1,5 +1,7 @@ https://www.ggg.at/2020/07/31/am-guertel-gibt-es-jetzt-den-laengsten-regenbogen-zebrastreifen/ Gürtel/Felberstraße (7x) +offizieller Name: "Neubaugürtel # Stollgasse", 7. +"Neubaugürtel # Felberstraße", 15. Mariahilfer Straße diff --git a/src/favicon.ts b/src/favicon.ts index ca6381f..dda51a6 100644 --- a/src/favicon.ts +++ b/src/favicon.ts @@ -17,6 +17,7 @@ import tipsIcon from "../assets/favicons/tips.png" import a1Icon from "../assets/favicons/a1.net.png" import orfIcon from "../assets/favicons/orf.png" import apaIcon from "../assets/favicons/apa.png" +import facebookIcon from "../assets/favicons/facebook.svg" export function faviconByHostname(hostname: string): string | undefined { @@ -54,6 +55,8 @@ export function faviconByHostname(hostname: string): string | undefined { return a1Icon case "www.ots.at": return apaIcon + case "www.facebook.com": + return facebookIcon } if (hostname.includes("spoe")) { diff --git a/src/text.ts b/src/text.ts index 94c1a10..18f4521 100644 --- a/src/text.ts +++ b/src/text.ts @@ -41,13 +41,16 @@ export function displaySources(sources: Source[]) { export function createDateWithDisclaimer(sources: Source[]): HTMLDivElement { const dateWithDisclaimer = createElement("div") - const earliestDate = sources.map(s => s.date).sort()[0] + const dates = sources.filter(s => s.type != "proposal").map(s => s.date).sort() const dateP = createElement("p") const disclaimerP = createElement("p") disclaimerP.innerText = "Das angezeigte Datum ist der Zeitpunkt der ersten Erwähnung in Medien " + "oder des ersten Bild auf Google Streetview." disclaimerP.style.display = "none" - dateP.innerText = prettyDate(earliestDate) + if (dates.length > 0) { + dateP.innerText = prettyDate(dates[0]) + } + dateP.innerText = "Datum unbekannt" const starLink = createElement("a") starLink.href = "#" starLink.innerText = "*"