From 3c50beca90a533f80667664679698c9701fcce16 Mon Sep 17 00:00:00 2001 From: Lukas Winkler Date: Wed, 10 Aug 2022 23:16:59 +0200 Subject: [PATCH] lots more data --- commands/fetch.ts | 4 +- data/data.json | 742 +++++++++++++++++++++++++++++++++++++++++++++- data/schema.json | 6 + missing.md | 7 +- src/main.ts | 2 +- 5 files changed, 751 insertions(+), 10 deletions(-) diff --git a/commands/fetch.ts b/commands/fetch.ts index 0f0ad81..ecac0df 100644 --- a/commands/fetch.ts +++ b/commands/fetch.ts @@ -75,10 +75,8 @@ async function runfetch() { length: lineLengthInM(coords[0], coords[1]) } // crossings[i] = d + fs.writeFileSync("../data/data.json", JSON.stringify(data, null, 2)) } - - - fs.writeFileSync("../data/data.json", JSON.stringify(data, null, 2)) } runfetch() diff --git a/data/data.json b/data/data.json index 5c839a6..6d4c398 100644 --- a/data/data.json +++ b/data/data.json @@ -219,7 +219,7 @@ { "id": 7, "name": "Laaer-Berg-Straße", - "bezirk": 12, + "bezirk": 10, "type": "prideFlag", "sources": [ { @@ -413,7 +413,7 @@ "sources": [ { "type": "news", - "url": "https://www.meinbezirk.at/hietzing/c-lokales/der-13-bezirk-hat-seinen-ersten-regenbogen-zebrastreifen_a5051167#gallery=null", + "url": "https://www.meinbezirk.at/hietzing/c-lokales/der-13-bezirk-hat-seinen-ersten-regenbogen-zebrastreifen_a5051167", "date": "2021-12-07" } ], @@ -514,7 +514,7 @@ "sources": [ { "type": "news", - "url": "https://www.meinbezirk.at/liesing/c-lokales/der-erste-regenbogenschutzweg-im-23-bezirk-wurde-eingeweiht_a4867192#gallery=null", + "url": "https://www.meinbezirk.at/liesing/c-lokales/der-erste-regenbogenschutzweg-im-23-bezirk-wurde-eingeweiht_a4867192", "date": "2021-09-07" } ], @@ -573,5 +573,741 @@ ], "length": 8.62 } + }, + { + "id": 17, + "name": "Rennweg", + "bezirk": 3, + "type": "prideFlag", + "comment": "Zweiter im 3. Bezirk", + "sources": [ + { + "type": "news", + "url": "https://www.meinbezirk.at/landstrasse/c-lokales/ein-zweiter-regenbogen-schutzweg-fuer-den-3-bezirk_a4780271", + "date": "2021-07-22" + } + ], + "geosource": { + "type": "OSMnodes", + "nodes": [ + 2564853034, + 2564853047, + 2564853055, + 2564853063, + 8638222134, + 4832863152, + 2564853073, + 5031014904 + ] + }, + "geo": { + "coords": [ + [ + 16.3862495, + 48.1944447 + ], + [ + 16.3862376, + 48.1947016 + ] + ], + "length": 28.58 + } + }, + { + "id": 18, + "name": "Museumsquartier", + "bezirk": 1, + "type": "prideFlag", + "comment": "Keine Informationen darüber, zwischen Juli 2019 und November 2020 gemalt", + "sources": [ + { + "type": "streetview", + "date": "2020-11-01" + } + ], + "geosource": { + "type": "OSMnodes", + "nodes": [ + 2447262091, + 9514394303, + 1566470380, + 1566470358, + 2383085668 + ] + }, + "geo": { + "coords": [ + [ + 16.3614233, + 48.2027465 + ], + [ + 16.3611638, + 48.2025852 + ] + ], + "length": 26.3 + } + }, + { + "id": 19, + "name": "Pilgrambrücke/Linke Wienzeile", + "bezirk": 6, + "type": "transFlag", + "sources": [ + { + "type": "proposal", + "url": "https://www.neos.eu/_Resources/Persistent/88acf02470d780adb8336396e37fe1b0a480d1b4/Antrag%20Trans-Pride-Schutzweg%2017.06.2021.pdf", + "date": "2021-07-17" + } + ], + "geosource": { + "type": "OSMnodes", + "nodes": [ + 2592738921, + 2592758061, + 1361284844, + 2592738920 + ] + }, + "geo": { + "coords": [ + [ + 16.3539177, + 48.1931398 + ], + [ + 16.3541619, + 48.1931214 + ] + ], + "length": 18.22 + } + }, + { + "id": 20, + "name": "Floridsdorfer Spitz 1/3", + "bezirk": 21, + "type": "prideFlag", + "set": "Floridsdorfer Spitz", + "sources": [ + { + "type": "news", + "url": "https://www.ggg.at/2021/04/23/neue-regenbogen-zebrastreifen-in-der-josefstadt-und-in-floridsdorf/", + "date": "2021-04-23" + } + ], + "geosource": { + "type": "OSMnodes", + "nodes": [ + 4606016055, + 1917791170, + 4606016053 + ] + }, + "geo": { + "coords": [ + [ + 16.3973886, + 48.2571802 + ], + [ + 16.3972706, + 48.2573353 + ] + ], + "length": 19.33 + } + }, + { + "id": 21, + "name": "Floridsdorfer Spitz 2/3", + "bezirk": 21, + "type": "prideFlag", + "set": "Floridsdorfer Spitz", + "sources": [ + { + "type": "news", + "url": "https://www.ggg.at/2021/04/23/neue-regenbogen-zebrastreifen-in-der-josefstadt-und-in-floridsdorf/", + "date": "2021-04-23" + } + ], + "geosource": { + "type": "OSMnodes", + "nodes": [ + 4606016053, + 4606016054, + 4606016051 + ] + }, + "geo": { + "coords": [ + [ + 16.3972706, + 48.2573353 + ], + [ + 16.3970715, + 48.2571919 + ] + ], + "length": 21.71 + } + }, + { + "id": 22, + "name": "Floridsdorfer Spitz 3/3", + "bezirk": 21, + "type": "prideFlag", + "set": "Floridsdorfer Spitz", + "sources": [ + { + "type": "news", + "url": "https://www.ggg.at/2021/04/23/neue-regenbogen-zebrastreifen-in-der-josefstadt-und-in-floridsdorf/", + "date": "2021-04-23" + } + ], + "geosource": { + "type": "RawCoords", + "coords": [ + [ + 16.39712, + 48.25709 + ], + [ + 16.39729, + 48.25705 + ] + ] + }, + "geo": { + "coords": [ + [ + 16.39712, + 48.25709 + ], + [ + 16.39729, + 48.25705 + ] + ], + "length": 13.35 + } + }, + { + "id": 23, + "name": "Josefstädter Straße/Albertgasse 1/3", + "bezirk": 8, + "type": "prideFlag", + "sources": [ + { + "type": "news", + "url": "https://www.ggg.at/2021/04/23/neue-regenbogen-zebrastreifen-in-der-josefstadt-und-in-floridsdorf/", + "date": "2021-04-23" + } + ], + "set": "Josefstädter Straße/Albertgasse", + "geosource": { + "type": "OSMway", + "wayID": 474840852 + }, + "geo": { + "coords": [ + [ + 16.3441357, + 48.2105211 + ], + [ + 16.3442049, + 48.2106235 + ] + ], + "length": 12.49 + } + }, + { + "id": 24, + "name": "Josefstädter Straße/Albertgasse 2/3", + "bezirk": 8, + "type": "transFlag", + "comment": "Trans Pride Streifen sind eventuell neuer", + "sources": [ + { + "type": "news", + "url": "https://www.ggg.at/2021/04/23/neue-regenbogen-zebrastreifen-in-der-josefstadt-und-in-floridsdorf/", + "date": "2021-04-23" + } + ], + "set": "Josefstädter Straße/Albertgasse", + "geosource": { + "type": "OSMway", + "wayID": 474384710 + }, + "geo": { + "coords": [ + [ + 16.3438991, + 48.2105608 + ], + [ + 16.3439856, + 48.2106828 + ] + ], + "length": 15 + } + }, + { + "id": 25, + "name": "Josefstädter Straße/Albertgasse 3/3", + "bezirk": 8, + "type": "transFlag", + "comment": "Trans Pride Streifen sind eventuell neuer", + "sources": [ + { + "type": "news", + "url": "https://www.ggg.at/2021/04/23/neue-regenbogen-zebrastreifen-in-der-josefstadt-und-in-floridsdorf/", + "date": "2021-04-23" + } + ], + "set": "Josefstädter Straße/Albertgasse", + "geosource": { + "type": "OSMnodes", + "nodes": [ + 4683542470, + 8179581404, + 2212886644, + 4683542596, + 4683542595, + 4683542610, + 4683542594 + ] + }, + "geo": { + "coords": [ + [ + 16.3439856, + 48.2106828 + ], + [ + 16.3438111, + 48.2107037 + ] + ], + "length": 13.14 + } + }, + { + "id": 26, + "name": "Äußere Mariahilfer Straße", + "bezirk": 15, + "type": "prideFlag", + "sources": [ + { + "type": "proposal", + "url": "https://www.wien.gv.at/bezirke/rudolfsheim-fuenfhaus/politik/sitzungen/pdf/antrag-20200604-gruene-regenbogenzebrastreifen.pdf", + "date": "2020-05-28" + } + ], + "geosource": { + "type": "OSMnodes", + "nodes": [ + 4690301681, + 3640663217, + 2522068335, + 2522068336, + 2522068339 + ] + }, + "geo": { + "coords": [ + [ + 16.3375668, + 48.1952033 + ], + [ + 16.3376342, + 48.1950924 + ] + ], + "length": 13.31 + } + }, + { + "id": 27, + "name": "Mariahilfer Straße/Neubaugasse", + "bezirk": 6, + "type": "prideFlag", + "comment": "Sind es zwei separate Zebrastreifen?", + "sources": [ + { + "type": "news", + "url": "https://www.meinbezirk.at/mariahilf/c-lokales/mariahilf-hat-einen-weiteren-regenbogen-zebrastreifen_a4707386", + "date": "2021-06-16" + } + ], + "geosource": { + "type": "RawCoords", + "coords": [ + [ + 16.35009, + 48.19822 + ], + [ + 16.35024, + 48.19827 + ] + ] + }, + "geo": { + "coords": [ + [ + 16.35009, + 48.19822 + ], + [ + 16.35024, + 48.19827 + ] + ], + "length": 12.43 + } + }, + { + "id": 28, + "name": "Thaliastraße/Brunnenstraße 1/3", + "bezirk": 16, + "type": "prideFlag", + "set": "Thaliastraße/Brunnenstraße", + "sources": [ + { + "type": "news", + "url": "https://www.meinbezirk.at/ottakring/c-lokales/neuer-regenbogenschutzweg-fuer-die-thaliastrasse_a4920679", + "date": "2021-10-01" + } + ], + "geosource": { + "type": "OSMnodes", + "nodes": [ + 4788475137, + 4788475126, + 4788475136, + 4788475135, + 4788475134, + 4788475133 + ] + }, + "geo": { + "coords": [ + [ + 16.3355435, + 48.2090962 + ], + [ + 16.3355024, + 48.2089569 + ] + ], + "length": 15.79 + } + }, + { + "id": 29, + "name": "Thaliastraße/Brunnenstraße 2/3", + "bezirk": 16, + "type": "prideFlag", + "set": "Thaliastraße/Brunnenstraße", + "sources": [ + { + "type": "news", + "url": "https://www.meinbezirk.at/ottakring/c-lokales/neuer-regenbogenschutzweg-fuer-die-thaliastrasse_a4920679", + "date": "2021-10-01" + } + ], + "geosource": { + "type": "OSMnodes", + "nodes": [ + 4788475133, + 2910147292, + 4788475132 + ] + }, + "geo": { + "coords": [ + [ + 16.3355024, + 48.2089569 + ], + [ + 16.3353413, + 48.2089781 + ] + ], + "length": 12.17 + } + }, + { + "id": 30, + "name": "Thaliastraße/Brunnenstraße 3/3", + "bezirk": 16, + "type": "prideFlag", + "set": "Thaliastraße/Brunnenstraße", + "sources": [ + { + "type": "news", + "url": "https://www.meinbezirk.at/ottakring/c-lokales/neuer-regenbogenschutzweg-fuer-die-thaliastrasse_a4920679", + "date": "2021-10-01" + } + ], + "geosource": { + "type": "OSMnodes", + "nodes": [ + 4788475131, + 4788475130, + 4788475129, + 4788475128, + 4788475127 + ] + }, + "geo": { + "coords": [ + [ + 16.3353112, + 48.2090079 + ], + [ + 16.3353476, + 48.2091263 + ] + ], + "length": 13.44 + } + }, + { + "id": 31, + "name": "Peter-Jordan-Straße/Dänenstraße 1/4", + "bezirk": 19, + "type": "prideFlag", + "set": "Peter-Jordan-Straße/Dänenstraße", + "sources": [ + { + "type": "news", + "url": "https://www.meinbezirk.at/waehring/c-politik/ein-neuer-regenbogenzebrastreifen-fuer-waehring-und-doebling_a5396545", + "date": "2022-07-08" + }, + { + "type": "official", + "url": "https://www.doebling.spoe.wien/2022/05/26/regenbogenzebrastreifen/", + "date": "2022-05-26" + } + ], + "geosource": { + "type": "OSMway", + "wayID": 545701829 + }, + "geo": { + "coords": [ + [ + 16.3344111, + 48.2371456 + ], + [ + 16.3344144, + 48.2370138 + ] + ], + "length": 14.66 + } + }, + { + "id": 32, + "name": "Peter-Jordan-Straße/Dänenstraße 2/4", + "bezirk": 19, + "type": "prideFlag", + "set": "Peter-Jordan-Straße/Dänenstraße", + "sources": [ + { + "type": "news", + "url": "https://www.meinbezirk.at/waehring/c-politik/ein-neuer-regenbogenzebrastreifen-fuer-waehring-und-doebling_a5396545", + "date": "2022-07-08" + } + ], + "geosource": { + "type": "OSMway", + "wayID": 545701830 + }, + "geo": { + "coords": [ + [ + 16.3344873, + 48.2371457 + ], + [ + 16.3346223, + 48.2371459 + ] + ], + "length": 10 + } + }, + { + "id": 33, + "name": "Peter-Jordan-Straße/Dänenstraße 3/4", + "bezirk": 19, + "type": "prideFlag", + "set": "Peter-Jordan-Straße/Dänenstraße", + "sources": [ + { + "type": "news", + "url": "https://www.meinbezirk.at/waehring/c-politik/ein-neuer-regenbogenzebrastreifen-fuer-waehring-und-doebling_a5396545", + "date": "2022-07-08" + } + ], + "geosource": { + "type": "OSMway", + "wayID": 545701832 + }, + "geo": { + "coords": [ + [ + 16.3346218, + 48.2370085 + ], + [ + 16.3346223, + 48.2371459 + ] + ], + "length": 15.28 + } + }, + { + "id": 34, + "name": "Peter-Jordan-Straße/Dänenstraße 4/4", + "bezirk": 19, + "type": "prideFlag", + "set": "Peter-Jordan-Straße/Dänenstraße", + "sources": [ + { + "type": "news", + "url": "https://www.meinbezirk.at/waehring/c-politik/ein-neuer-regenbogenzebrastreifen-fuer-waehring-und-doebling_a5396545", + "date": "2022-07-08" + } + ], + "geosource": { + "type": "OSMway", + "wayID": 241860018 + }, + "geo": { + "coords": [ + [ + 16.3346218, + 48.2370085 + ], + [ + 16.3344998, + 48.2370138 + ] + ], + "length": 9.05 + } + }, + { + "id": 35, + "name": "Billrothstraße/Gymnasiumstraße", + "bezirk": 19, + "type": "prideFlag", + "sources": [ + { + "type": "official", + "url": "https://www.doebling.spoe.wien/2021/05/07/doeblings-erster-regenbogenzebrastreifen-ist-da/", + "date": "2021-05-07" + } + ], + "geosource": { + "type": "OSMway", + "wayID": 1046483925 + }, + "geo": { + "coords": [ + [ + 16.3489986, + 48.2364276 + ], + [ + 16.3489157, + 48.2364356 + ] + ], + "length": 6.2 + } + }, + { + "id": 36, + "name": "Rauscherstraße/Wallensteinstraße", + "bezirk": 20, + "type": "prideFlag", + "sources": [ + { + "type": "news", + "url": "https://www.meinbezirk.at/brigittenau/c-politik/zwei-regenbogen-zebrastreifen-fuer-die-brigittenau_a5240977", + "date": "2022-03-28" + } + ], + "geosource": { + "type": "OSMnodes", + "nodes": [ + 4688623932, + 3904389980, + 2294764775, + 2709142271, + 3904389990, + 4688623933 + ] + }, + "geo": { + "coords": [ + [ + 16.3748602, + 48.2308331 + ], + [ + 16.3747791, + 48.2309925 + ] + ], + "length": 18.71 + } + }, + { + "id": 37, + "name": "Winarskystraße/Dresdner Straße", + "bezirk": 20, + "type": "prideFlag", + "sources": [ + { + "type": "news", + "url": "https://www.meinbezirk.at/brigittenau/c-politik/zwei-regenbogen-zebrastreifen-fuer-die-brigittenau_a5240977", + "date": "2022-03-28" + } + ], + "geosource": { + "type": "OSMway", + "wayID": 782344663 + }, + "geo": { + "coords": [ + [ + 16.3784316, + 48.2381643 + ], + [ + 16.3781605, + 48.2380099 + ] + ], + "length": 26.42 + } } ] \ No newline at end of file diff --git a/data/schema.json b/data/schema.json index 145d605..bdaba30 100644 --- a/data/schema.json +++ b/data/schema.json @@ -26,6 +26,7 @@ "const": "RawCoords" }, "coords": { + "uniqueItems": true, "$ref": "#/definitions/Coordinates" } } @@ -39,6 +40,7 @@ "nodes": { "type": "array", "minItems": 2, + "uniqueItems": true, "items": { "type": "number" } @@ -65,6 +67,7 @@ "enum": [ "news", "official", + "proposal", "streetview", "in person" ] @@ -112,6 +115,9 @@ "comment": { "type": "string" }, + "set": { + "type": "string" + }, "sources": { "type": "array", "items": { diff --git a/missing.md b/missing.md index d410937..4bb42a7 100644 --- a/missing.md +++ b/missing.md @@ -1,6 +1,7 @@ https://www.ggg.at/2020/07/31/am-guertel-gibt-es-jetzt-den-laengsten-regenbogen-zebrastreifen/ Gürtel/Felberstraße (7x) -Josefstädter Straße/Albertgasse (1+2) -https://www.ggg.at/2021/04/23/neue-regenbogen-zebrastreifen-in-der-josefstadt-und-in-floridsdorf/ -Floridsdorfer Spitz (3x) +Mariahilfer Straße + +Unbekannter Trans-Pride-Streifen in Rudolfsheim-Fünfhaus +https://www.wien.gv.at/bezirke/rudolfsheim-fuenfhaus/politik/sitzungen/pdf/20210701-antrag-pride-schutzweg.pdf diff --git a/src/main.ts b/src/main.ts index 02aa529..c9f9660 100644 --- a/src/main.ts +++ b/src/main.ts @@ -189,7 +189,7 @@ map.on('singleclick', function (event) { overlay.setPosition(coordinate); - }, {hitTolerance: 20}) + }, {hitTolerance: 5}) if (!map.hasFeatureAtPixel(event.pixel, {hitTolerance: 2})) { overlay.setPosition(undefined); closer.blur();