1
0
Fork 0
mirror of https://github.com/Findus23/RainbowRoad.git synced 2024-09-19 16:03:52 +02:00

remove halleinflag

This commit is contained in:
Lukas Winkler 2023-05-21 18:08:03 +02:00
parent ea6841cfb9
commit 0c0c58d9d8
Signed by: lukas
GPG key ID: 54DE4D798D244853
4 changed files with 2 additions and 17 deletions

View file

@ -138,8 +138,7 @@
"type": "string", "type": "string",
"enum": [ "enum": [
"prideFlag", "prideFlag",
"transFlag", "transFlag"
"HalleinPrideFlag"
] ]
}, },
"geo": { "geo": {

View file

@ -1,4 +1,4 @@
export type FlagType = "prideFlag" | "transFlag" | "HalleinPrideFlag" export type FlagType = "prideFlag" | "transFlag"
export type Coord = number[] export type Coord = number[]
export type Coords = Coord[] export type Coords = Coord[]

View file

@ -8,7 +8,6 @@ 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";
@ -77,12 +76,6 @@ 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,
@ -112,8 +105,6 @@ 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;
} }

View file

@ -3,9 +3,6 @@ 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 {
@ -24,12 +21,10 @@ 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
} }