From 0c0c58d9d8e7603743bfc49da17d67bc05ff83cd Mon Sep 17 00:00:00 2001 From: Lukas Winkler Date: Sun, 21 May 2023 18:08:03 +0200 Subject: [PATCH] remove halleinflag --- data/schema.json | 3 +-- interfaces.ts | 2 +- src/map.ts | 9 --------- src/zebraUtils.ts | 5 ----- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/data/schema.json b/data/schema.json index 1a96f9a..61c0e3d 100644 --- a/data/schema.json +++ b/data/schema.json @@ -138,8 +138,7 @@ "type": "string", "enum": [ "prideFlag", - "transFlag", - "HalleinPrideFlag" + "transFlag" ] }, "geo": { diff --git a/interfaces.ts b/interfaces.ts index 896d3c3..25e8844 100644 --- a/interfaces.ts +++ b/interfaces.ts @@ -1,4 +1,4 @@ -export type FlagType = "prideFlag" | "transFlag" | "HalleinPrideFlag" +export type FlagType = "prideFlag" | "transFlag" export type Coord = number[] export type Coords = Coord[] diff --git a/src/map.ts b/src/map.ts index 1bb6ed8..4f4fd16 100644 --- a/src/map.ts +++ b/src/map.ts @@ -8,7 +8,6 @@ import {State} from "ol/render"; import {Line, Vector2d} from "./vectorUtils"; import {drawZebraCrossing, zebraPatterns} from "./zebraUtils"; import prideFlag from "../assets/prideflag.svg" -import prideFlagHallein from "../assets/prideflag-hallein.svg" import transFlag from "../assets/transflag.svg" import {FeatureProperties} from "./features"; import {areas, viewFromArea, Wien} from "./areaData"; @@ -77,12 +76,6 @@ const prideFlagStyle = new Style({ scale: 0.05 }) }) -const prideFlagHalleinStyle = new Style({ - image: new Icon({ - src: prideFlagHallein, - scale: 0.05 - }) -}) const transFlagStyle = new Style({ image: new Icon({ src: transFlag, @@ -112,8 +105,6 @@ const vectorLineLayer = new VectorLayer({ switch (crossing.type) { case "prideFlag": return prideFlagStyle; - case "HalleinPrideFlag": - return prideFlagHalleinStyle; case "transFlag": return transFlagStyle; } diff --git a/src/zebraUtils.ts b/src/zebraUtils.ts index 2d63ad3..05da2c9 100644 --- a/src/zebraUtils.ts +++ b/src/zebraUtils.ts @@ -3,9 +3,6 @@ import {FlagType} from "../interfaces"; export const prideFlagColors = ["#e40303", "#ff8c00", "#ffed00", "#008026", "#004dff", "#750787"] export const transFlagColors = ["#5BCEFA", "#F5A9B8"] -let prideFlagHalleinColors = prideFlagColors.slice() -prideFlagHalleinColors[0] = prideFlagColors[1] -prideFlagHalleinColors[1] = prideFlagColors[0] export type PatternFunction = (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 prideZebraHalleinPattern = generateFlagZebraPattern(prideFlagHalleinColors) export const transZebraPattern = generateFlagZebraPattern(transFlagColors) export const zebraPatterns: { [d in FlagType]: PatternFunction } = { "prideFlag": prideZebraPattern, - "HalleinPrideFlag": prideZebraHalleinPattern, "transFlag": transZebraPattern }