mirror of
https://github.com/Findus23/RainbowRoad.git
synced 2024-09-19 16:03:52 +02:00
add more crossings
This commit is contained in:
parent
a67ea54c9b
commit
aab6281872
18 changed files with 566 additions and 282 deletions
BIN
assets/favicons/a1.net.png
Normal file
BIN
assets/favicons/a1.net.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.4 KiB |
10
assets/favicons/gruene.at.svg
Normal file
10
assets/favicons/gruene.at.svg
Normal file
File diff suppressed because one or more lines are too long
After Width: | Height: | Size: 12 KiB |
BIN
assets/favicons/orf.png
Normal file
BIN
assets/favicons/orf.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.3 KiB |
8
assets/prideflag-hallein.svg
Normal file
8
assets/prideflag-hallein.svg
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 777 480" width="777" height="480">
|
||||||
|
<path fill="#750787" d="M0 0h777v480H0z"/>
|
||||||
|
<path fill="#004dff" d="M0 0h777v400H0z"/>
|
||||||
|
<path fill="#008026" d="M0 0h777v320H0z"/>
|
||||||
|
<path fill="#ffed00" d="M0 0h777v240H0z"/>
|
||||||
|
<path fill="#e40303" d="M0 0h777v160H0z"/>
|
||||||
|
<path fill="#ff8c00" d="M0 0h777v80H0z"/>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 376 B |
|
@ -37,5 +37,43 @@
|
||||||
],
|
],
|
||||||
"length": 12.91
|
"length": 12.91
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 234624664,
|
||||||
|
"name": "Hornstein",
|
||||||
|
"type": "prideFlag",
|
||||||
|
"sources": [
|
||||||
|
{
|
||||||
|
"type": "news",
|
||||||
|
"url": "https://www.meinbezirk.at/eisenstadt/c-lokales/regenbogen-zebrastreifen-in-hornstein_a5678653",
|
||||||
|
"date": "2022-10-28"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"geosource": {
|
||||||
|
"type": "RawCoords",
|
||||||
|
"coords": [
|
||||||
|
[
|
||||||
|
16.44589,
|
||||||
|
47.88057
|
||||||
|
],
|
||||||
|
[
|
||||||
|
16.44602,
|
||||||
|
47.88057
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"geo": {
|
||||||
|
"coords": [
|
||||||
|
[
|
||||||
|
16.44589,
|
||||||
|
47.88057
|
||||||
|
],
|
||||||
|
[
|
||||||
|
16.44602,
|
||||||
|
47.88057
|
||||||
|
]
|
||||||
|
],
|
||||||
|
"length": 9.69
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
|
@ -173,4 +173,4 @@
|
||||||
"length": 13.54
|
"length": 13.54
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
|
@ -165,5 +165,39 @@
|
||||||
],
|
],
|
||||||
"length": 9.36
|
"length": 9.36
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 2662817586,
|
||||||
|
"name": "Ried im Innkreis",
|
||||||
|
"type": "prideFlag",
|
||||||
|
"sources": [
|
||||||
|
{
|
||||||
|
"type": "news",
|
||||||
|
"url": "https://www.meinbezirk.at/ried/c-lokales/stadt-ried-hat-einen-regenbogen-zebrastreifen_a5628343",
|
||||||
|
"date": "2022-10-04"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"geosource": {
|
||||||
|
"type": "OSMnodes",
|
||||||
|
"nodes": [
|
||||||
|
9387994416,
|
||||||
|
3253906680,
|
||||||
|
3662778319,
|
||||||
|
9388012217
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"geo": {
|
||||||
|
"coords": [
|
||||||
|
[
|
||||||
|
13.4861416,
|
||||||
|
48.2099182
|
||||||
|
],
|
||||||
|
[
|
||||||
|
13.4859122,
|
||||||
|
48.2099021
|
||||||
|
]
|
||||||
|
],
|
||||||
|
"length": 17.09
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
|
@ -47,5 +47,54 @@
|
||||||
],
|
],
|
||||||
"length": 9.99
|
"length": 9.99
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 932441635,
|
||||||
|
"name": "Hallein",
|
||||||
|
"type": "HalleinPrideFlag",
|
||||||
|
"comment": "Farben vertauscht",
|
||||||
|
"sources": [
|
||||||
|
{
|
||||||
|
"type": "news",
|
||||||
|
"url": "https://www.meinbezirk.at/tennengau/c-lokales/hallein-bekommt-einen-regenbogen-zebrastreifen_a5460253",
|
||||||
|
"date": "2022-07-07"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "news",
|
||||||
|
"url": "https://www.meinbezirk.at/tennengau/c-lokales/regenbogen-zebrastreifen-in-hallein-beschmiert_a5633809",
|
||||||
|
"date": "2022-10-06"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "news",
|
||||||
|
"url": "https://salzburg.orf.at/stories/3177392/",
|
||||||
|
"date": "2022-10-10"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"geosource": {
|
||||||
|
"type": "RawCoords",
|
||||||
|
"coords": [
|
||||||
|
[
|
||||||
|
13.09879,
|
||||||
|
47.67703
|
||||||
|
],
|
||||||
|
[
|
||||||
|
13.09884,
|
||||||
|
47.67693
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"geo": {
|
||||||
|
"coords": [
|
||||||
|
[
|
||||||
|
13.09879,
|
||||||
|
47.67703
|
||||||
|
],
|
||||||
|
[
|
||||||
|
13.09884,
|
||||||
|
47.67693
|
||||||
|
]
|
||||||
|
],
|
||||||
|
"length": 11.73
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -1343,5 +1343,81 @@
|
||||||
],
|
],
|
||||||
"length": 16.06
|
"length": 16.06
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 4048820989,
|
||||||
|
"name": "Schüttaustraße",
|
||||||
|
"bezirk": 22,
|
||||||
|
"type": "prideFlag",
|
||||||
|
"comment": "Erster im 22. Bezirk",
|
||||||
|
"sources": [
|
||||||
|
{
|
||||||
|
"type": "photo",
|
||||||
|
"url": "https://donaustadt.gruene.at/wp-content/uploads/sites/24/2022/08/Schuettaustrasse-Regenbogenzebrastreifen-Kaisermuehlen-20220803_105701.jpg",
|
||||||
|
"date": "2022-08-03"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"geosource": {
|
||||||
|
"type": "OSMnodes",
|
||||||
|
"nodes": [
|
||||||
|
290062177,
|
||||||
|
2449174864,
|
||||||
|
2449174860,
|
||||||
|
290062182
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"geo": {
|
||||||
|
"coords": [
|
||||||
|
[
|
||||||
|
16.4171831,
|
||||||
|
48.2309996
|
||||||
|
],
|
||||||
|
[
|
||||||
|
16.4169777,
|
||||||
|
48.2308745
|
||||||
|
]
|
||||||
|
],
|
||||||
|
"length": 20.61
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 706479564,
|
||||||
|
"name": "Lassallestraße",
|
||||||
|
"bezirk": 2,
|
||||||
|
"type": "prideFlag",
|
||||||
|
"sources": [
|
||||||
|
{
|
||||||
|
"type": "news",
|
||||||
|
"url": "https://www.meinbezirk.at/leopoldstadt/c-lokales/leopoldstadt-setzt-bunte-zeichen-fuer-vielfalt-und-solidaritaet_a4698233",
|
||||||
|
"date": "2021-06-17"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "news",
|
||||||
|
"url": "https://newsroom.a1.net/news-regenbogen-zebrastreifen-vor-der-a1-zentrale-auf-der-lassallestrasse?id=134325&menueid=13052&l=deutsch",
|
||||||
|
"date": "2021-05-31"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"geosource": {
|
||||||
|
"type": "OSMnodes",
|
||||||
|
"nodes": [
|
||||||
|
3674043389,
|
||||||
|
1702310383,
|
||||||
|
338819939,
|
||||||
|
519190048
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"geo": {
|
||||||
|
"coords": [
|
||||||
|
[
|
||||||
|
16.4005148,
|
||||||
|
48.223146
|
||||||
|
],
|
||||||
|
[
|
||||||
|
16.4002596,
|
||||||
|
48.2233589
|
||||||
|
]
|
||||||
|
],
|
||||||
|
"length": 30.3
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
|
@ -134,7 +134,8 @@
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"enum": [
|
"enum": [
|
||||||
"prideFlag",
|
"prideFlag",
|
||||||
"transFlag"
|
"transFlag",
|
||||||
|
"HalleinPrideFlag"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"geo": {
|
"geo": {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
export type FlagType = "prideFlag" | "transFlag"
|
export type FlagType = "prideFlag" | "transFlag" | "HalleinPrideFlag"
|
||||||
|
|
||||||
export type Coord = number[]
|
export type Coord = number[]
|
||||||
export type Coords = Coord[]
|
export type Coords = Coord[]
|
||||||
|
|
|
@ -13,10 +13,9 @@ https://www.linz.at/medienservice/2022/202206_115655.php
|
||||||
|
|
||||||
OÖ:
|
OÖ:
|
||||||
https://www.meinbezirk.at/freistadt/c-lokales/freistadt-bekommt-regenbogen-zebrastreifen_a5471665
|
https://www.meinbezirk.at/freistadt/c-lokales/freistadt-bekommt-regenbogen-zebrastreifen_a5471665
|
||||||
- Ried
|
|
||||||
- Steyr
|
- Steyr
|
||||||
- Steyregg (https://www.meinbezirk.at/linz/c-politik/steyregg-setzt-buntes-zeichen-gegen-identitaere-bewegung_a4793903)
|
- Steyregg (https://www.meinbezirk.at/linz/c-politik/steyregg-setzt-buntes-zeichen-gegen-identitaere-bewegung_a4793903)
|
||||||
|
- Efferding: https://www.meinbezirk.at/grieskirchen-eferding/c-politik/wir-wollen-ein-zeichen-fuer-toleranz-setzen_a5674603
|
||||||
Vermutlich vollständig:
|
Vermutlich vollständig:
|
||||||
|
|
||||||
- NÖ
|
- NÖ
|
||||||
|
|
586
package-lock.json
generated
586
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -19,7 +19,7 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ajv-cli": "^5.0.0",
|
"ajv-cli": "^5.0.0",
|
||||||
"axios": "^0.27.2",
|
"axios": "^1.1.3",
|
||||||
"hint.css": "^2.7.0",
|
"hint.css": "^2.7.0",
|
||||||
"micromodal": "^0.4.10",
|
"micromodal": "^0.4.10",
|
||||||
"navigo": "^8.11.1",
|
"navigo": "^8.11.1",
|
||||||
|
|
|
@ -3,6 +3,7 @@ import meinBezirkIcon from "../assets/favicons/meinbezirk.at.png"
|
||||||
import kurierIcon from "../assets/favicons/kurier.at.png"
|
import kurierIcon from "../assets/favicons/kurier.at.png"
|
||||||
import spoeIcon from "../assets/favicons/spoe.png"
|
import spoeIcon from "../assets/favicons/spoe.png"
|
||||||
import neosIcon from "../assets/favicons/neos.svg"
|
import neosIcon from "../assets/favicons/neos.svg"
|
||||||
|
import grueneIcon from "../assets/favicons/gruene.at.svg"
|
||||||
import WienIcon from "../assets/favicons/wien.gv.at.svg"
|
import WienIcon from "../assets/favicons/wien.gv.at.svg"
|
||||||
import derStandardIcon from "../assets/favicons/derstandard.at.png"
|
import derStandardIcon from "../assets/favicons/derstandard.at.png"
|
||||||
import linzIcon from "../assets/favicons/linz.at.png"
|
import linzIcon from "../assets/favicons/linz.at.png"
|
||||||
|
@ -13,6 +14,9 @@ import ttIcon from "../assets/favicons/tt.png"
|
||||||
import salzburg24Icon from "../assets/favicons/salzburg24.png"
|
import salzburg24Icon from "../assets/favicons/salzburg24.png"
|
||||||
import fmtIcon from "../assets/favicons/fmt.png"
|
import fmtIcon from "../assets/favicons/fmt.png"
|
||||||
import tipsIcon from "../assets/favicons/tips.png"
|
import tipsIcon from "../assets/favicons/tips.png"
|
||||||
|
import a1Icon from "../assets/favicons/a1.net.png"
|
||||||
|
import orfIcon from "../assets/favicons/orf.png"
|
||||||
|
import {or} from "ol/format/filter";
|
||||||
|
|
||||||
export function faviconByHostname(hostname: string): string | undefined {
|
export function faviconByHostname(hostname: string): string | undefined {
|
||||||
|
|
||||||
|
@ -45,9 +49,17 @@ export function faviconByHostname(hostname: string): string | undefined {
|
||||||
return fmtIcon
|
return fmtIcon
|
||||||
case "www.tips.at":
|
case "www.tips.at":
|
||||||
return tipsIcon
|
return tipsIcon
|
||||||
|
case "newsroom.a1.net":
|
||||||
|
return a1Icon
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hostname.includes("spoe")) {
|
if (hostname.includes("spoe")) {
|
||||||
return spoeIcon
|
return spoeIcon
|
||||||
}
|
}
|
||||||
|
if (hostname.includes("gruene.at")) {
|
||||||
|
return grueneIcon
|
||||||
|
}
|
||||||
|
if (hostname.includes("orf.at")) {
|
||||||
|
return orfIcon
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,7 @@ import {State} from "ol/render";
|
||||||
import {Line, Vector2d} from "./vectorUtils";
|
import {Line, Vector2d} from "./vectorUtils";
|
||||||
import {drawZebraCrossing, zebraPatterns} from "./zebraUtils";
|
import {drawZebraCrossing, zebraPatterns} from "./zebraUtils";
|
||||||
import prideFlag from "../assets/prideflag.svg"
|
import prideFlag from "../assets/prideflag.svg"
|
||||||
|
import prideFlagHallein from "../assets/prideflag-hallein.svg"
|
||||||
import transFlag from "../assets/transflag.svg"
|
import transFlag from "../assets/transflag.svg"
|
||||||
import {FeatureProperties} from "./features";
|
import {FeatureProperties} from "./features";
|
||||||
import {areas, viewFromArea, Wien} from "./areaData";
|
import {areas, viewFromArea, Wien} from "./areaData";
|
||||||
|
@ -66,6 +67,12 @@ const prideFlagStyle = new Style({
|
||||||
scale: 0.05
|
scale: 0.05
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
const prideFlagHalleinStyle = new Style({
|
||||||
|
image: new Icon({
|
||||||
|
src: prideFlagHallein,
|
||||||
|
scale: 0.05
|
||||||
|
})
|
||||||
|
})
|
||||||
const transFlagStyle = new Style({
|
const transFlagStyle = new Style({
|
||||||
image: new Icon({
|
image: new Icon({
|
||||||
src: transFlag,
|
src: transFlag,
|
||||||
|
@ -101,6 +108,8 @@ const vectorLineLayer = new VectorLayer({
|
||||||
switch (crossing.type) {
|
switch (crossing.type) {
|
||||||
case "prideFlag":
|
case "prideFlag":
|
||||||
return prideFlagStyle;
|
return prideFlagStyle;
|
||||||
|
case "HalleinPrideFlag":
|
||||||
|
return prideFlagHalleinStyle;
|
||||||
case "transFlag":
|
case "transFlag":
|
||||||
return transFlagStyle;
|
return transFlagStyle;
|
||||||
}
|
}
|
||||||
|
|
|
@ -88,8 +88,8 @@ html, body {
|
||||||
.ol-popup-closer {
|
.ol-popup-closer {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 2px;
|
top: 6px;
|
||||||
right: 8px;
|
right: 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ol-popup-closer:after {
|
.ol-popup-closer:after {
|
||||||
|
|
|
@ -3,14 +3,16 @@ import {FlagType} from "../interfaces";
|
||||||
|
|
||||||
export const prideFlagColors = ["#e40303", "#ff8c00", "#ffed00", "#008026", "#004dff", "#750787"]
|
export const prideFlagColors = ["#e40303", "#ff8c00", "#ffed00", "#008026", "#004dff", "#750787"]
|
||||||
export const transFlagColors = ["#5BCEFA", "#F5A9B8"]
|
export const transFlagColors = ["#5BCEFA", "#F5A9B8"]
|
||||||
|
let prideFlagHalleinColors = prideFlagColors.slice()
|
||||||
|
prideFlagHalleinColors[0] = prideFlagColors[1]
|
||||||
|
prideFlagHalleinColors[1] = prideFlagColors[0]
|
||||||
export type PatternFunction = (i: number) => string
|
export type PatternFunction = (i: number) => string
|
||||||
|
|
||||||
export function zebraPattern(i: number): string {
|
export function zebraPattern(i: number): string {
|
||||||
return i % 2 == 0 ? "white" : "black";
|
return i % 2 == 0 ? "white" : "black";
|
||||||
}
|
}
|
||||||
|
|
||||||
export function generateFlagZebraPattern(colors: string[]):PatternFunction {
|
export function generateFlagZebraPattern(colors: string[]): PatternFunction {
|
||||||
return (i: number): string => {
|
return (i: number): string => {
|
||||||
if (i % 2) {
|
if (i % 2) {
|
||||||
return "white"
|
return "white"
|
||||||
|
@ -22,10 +24,12 @@ export function generateFlagZebraPattern(colors: string[]):PatternFunction {
|
||||||
}
|
}
|
||||||
|
|
||||||
export const prideZebraPattern = generateFlagZebraPattern(prideFlagColors)
|
export const prideZebraPattern = generateFlagZebraPattern(prideFlagColors)
|
||||||
|
export const prideZebraHalleinPattern = generateFlagZebraPattern(prideFlagHalleinColors)
|
||||||
export const transZebraPattern = generateFlagZebraPattern(transFlagColors)
|
export const transZebraPattern = generateFlagZebraPattern(transFlagColors)
|
||||||
|
|
||||||
export const zebraPatterns: { [d in FlagType]: PatternFunction } = {
|
export const zebraPatterns: { [d in FlagType]: PatternFunction } = {
|
||||||
"prideFlag": prideZebraPattern,
|
"prideFlag": prideZebraPattern,
|
||||||
|
"HalleinPrideFlag": prideZebraHalleinPattern,
|
||||||
"transFlag": transZebraPattern
|
"transFlag": transZebraPattern
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue