From 7ad601f2ebe5375ef26197d8f18c456d2e3738db Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 14 Dec 2020 01:14:22 +0100 Subject: [PATCH] Remove kletterspots.de specific stuff --- Customizations/AllKnownLayouts.ts | 18 +++++++++--------- InitUiElements.ts | 2 +- UI/WelcomeMessage.ts | 3 +-- UI/i18n/Locale.ts | 2 +- assets/themes/climbing/climbing.json | 4 ++++ assets/translations.json | 4 ---- index.html | 10 ++++------ index.ts | 2 +- scripts/createLayouts.ts | 4 ++-- 9 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Customizations/AllKnownLayouts.ts b/Customizations/AllKnownLayouts.ts index 19290f902..efcee3379 100644 --- a/Customizations/AllKnownLayouts.ts +++ b/Customizations/AllKnownLayouts.ts @@ -47,22 +47,22 @@ export class AllKnownLayouts { new LayoutConfig(personal), AllKnownLayouts.GenerateCycloFix(), new LayoutConfig(aed), - // new LayoutConfig(bookcases), + new LayoutConfig(bookcases), new LayoutConfig(toilets), - // new LayoutConfig(artworks), - // new LayoutConfig(ghostbikes), + new LayoutConfig(artworks), + new LayoutConfig(ghostbikes), new LayoutConfig(shops), new LayoutConfig(drinking_water), new LayoutConfig(nature), new LayoutConfig(cyclestreets), - // new LayoutConfig(maps), - // new LayoutConfig(fritures), + new LayoutConfig(maps), + new LayoutConfig(fritures), new LayoutConfig(benches), new LayoutConfig(charging_stations), - // new LayoutConfig(widths), - // new LayoutConfig(buurtnatuur), - // new LayoutConfig(bike_monitoring_stations), - // new LayoutConfig(surveillance_cameras) + new LayoutConfig(widths), + new LayoutConfig(buurtnatuur), + new LayoutConfig(bike_monitoring_stations), + new LayoutConfig(surveillance_cameras) new LayoutConfig(climbing), ]; diff --git a/InitUiElements.ts b/InitUiElements.ts index 3c184328a..e5e888169 100644 --- a/InitUiElements.ts +++ b/InitUiElements.ts @@ -80,7 +80,7 @@ export class InitUiElements { layoutDefinition: string = "") { if (layoutToUse === undefined) { console.log("Incorrect layout") - new FixedUiElement("Error: incorrect layout " + layoutName + "
Go back").AttachTo("centermessage").onClick(() => { + new FixedUiElement(`Error: incorrect layout ${layoutName}
Go back`).AttachTo("centermessage").onClick(() => { }); throw "Incorrect layout" } diff --git a/UI/WelcomeMessage.ts b/UI/WelcomeMessage.ts index 2afce3f53..285123601 100644 --- a/UI/WelcomeMessage.ts +++ b/UI/WelcomeMessage.ts @@ -53,8 +53,7 @@ export class WelcomeMessage extends UIElement { loginStatus, this.tail, "
", - this.languagePicker, - Translations.t.general.customIntro as UIElement + this.languagePicker ]).Render() } diff --git a/UI/i18n/Locale.ts b/UI/i18n/Locale.ts index 01aa11c7b..9482766a4 100644 --- a/UI/i18n/Locale.ts +++ b/UI/i18n/Locale.ts @@ -8,7 +8,7 @@ export default class Locale { public static language: UIEventSource = Locale.setup(); private static setup() { - const source = LocalStorageSource.Get('language', "de"); + const source = LocalStorageSource.Get('language', "en"); if (!UIElement.runningFromConsole) { // @ts-ignore window.setLanguage = function (language: string) { diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json index 7836aa52d..0c0363f4e 100644 --- a/assets/themes/climbing/climbing.json +++ b/assets/themes/climbing/climbing.json @@ -10,6 +10,10 @@ "de": "Auf dieser Karte finden Sie verschiedene Klettermöglichkeiten wie Kletterhallen, Boulderhallen und Felsen in der Natur.", "en": "On this map you will find various climbing opportunities such as climbing gyms, bouldering halls and rocks in nature." }, + "descriptionTail": { + "en": "

kletterspots.de is run by Christian Neumann. Please get in touch if you have feedback or questions.

The project uses data of the OpenStreetMap project and is based on the free software MapComplete.

", + "de": "

kletterspots.de wird betrieben von Christian Neumann. Bitte melden Sie sich, wenn Sie Feedback oder Fragen haben.

Das Projekt nutzt Daten des OpenStreetMap Projekts und basiert auf der freien Software MapComplete.

" + }, "language": [ "de", "en", diff --git a/assets/translations.json b/assets/translations.json index 08b10e4e2..ff6a1e4b3 100644 --- a/assets/translations.json +++ b/assets/translations.json @@ -470,10 +470,6 @@ "de": "Die E-Mail-Adresse dieser {category} lautet {email}" } }, - "customIntro": { - "en": "

kletterspots.de is run by Christian Neumann. Please get in touch if you have feedback or questions.

The project uses data of the OpenStreetMap project and is based on the free software MapComplete.

", - "de": "

kletterspots.de wird betrieben von Christian Neumann. Bitte melden Sie sich, wenn Sie Feedback oder Fragen haben.

Das Projekt nutzt Daten des OpenStreetMap Projekts und basiert auf der freien Software MapComplete.

" - }, "openStreetMapIntro": { "en": "

An Open Map

Wouldn't it be cool if there was a single map, which everyone could freely use and edit? A single place to store all geo-information? Then, all those websites with different, small and incompatible maps (which are always outdated) wouldn't be needed anymore.

OpenStreetMap is this map. The map data can be used for free (with attribution and publication of changes to that data). On top of that, everyone can freely add new data and fix errors. This website uses OpenStreetMap as well. All the data is from there, and your answers and corrections are added there as well.

A ton of people and application already use OpenStreetMap: Maps.me, OsmAnd, but also the maps at Facebook, Instagram, Apple-maps and Bing-maps are (partly) powered by OpenStreetMap.If you change something here, it'll be reflected in those applications too - after their next update!

", "es": "

Un mapa abierto

¿No sería genial si hubiera un solo mapa, que todos pudieran usar y editar libremente?¿Un solo lugar para almacenar toda la información geográfica? Entonces, todos esos sitios web con mapas diferentes, pequeños e incompatibles (que siempre están desactualizados) ya no serían necesarios.

OpenStreetMap es ese mapa. Los datos del mapa se pueden utilizar de forma gratuita (con atribución y publicación de cambios en esos datos).Además de eso, todos pueden agregar libremente nuevos datos y corregir errores. Este sitio web también usa OpenStreetMap. Todos los datos provienen de allí, y tus respuestas y correcciones también se añadirán allí.

Muchas personas y aplicaciones ya usan OpenStreetMap: Maps.me, OsmAnd, pero también los mapas de Facebook, Instagram, Apple y Bing son (en parte) impulsados ​​por OpenStreetMap .Si cambias algo aquí, también se reflejará en esas aplicaciones, en su próxima actualización

", diff --git a/index.html b/index.html index fa022ce90..abc12e710 100644 --- a/index.html +++ b/index.html @@ -18,7 +18,7 @@ - + @@ -30,8 +30,6 @@ } - - @@ -39,7 +37,7 @@ id="decoration-desktop"> - + @@ -62,13 +60,13 @@
-
Lade...
+
Loading MapComplete, hang on...
- + diff --git a/index.ts b/index.ts index f6337fdbf..efb9dbd75 100644 --- a/index.ts +++ b/index.ts @@ -7,7 +7,7 @@ import * as $ from "jquery"; import LayoutConfig from "./Customizations/JSON/LayoutConfig"; import {Utils} from "./Utils"; -let defaultLayout = "climbing" +let defaultLayout = "bookcases" // --------------------- Special actions based on the parameters ----------------- // @ts-ignore if (location.href.startsWith("http://buurtnatuur.be")) { diff --git a/scripts/createLayouts.ts b/scripts/createLayouts.ts index 4f2d93a36..f83da2a41 100644 --- a/scripts/createLayouts.ts +++ b/scripts/createLayouts.ts @@ -86,11 +86,11 @@ function generateWikiEntry(layout: LayoutConfig){ auth=`Yes, by ${layout.maintainer};` } return `{{service_item -|name= [https://kletterspots.de/${layout.id}.html ${layout.id}] +|name= [https://mapcomplete.osm.be/${layout.id}.html ${layout.id}] |region= Worldwide |lang= ${languages} |descr= A MapComplete theme: ${Translations.W(layout.description).InnerRender()} -|material= {{yes|[https://kletterspots.de/ ${auth}]}} +|material= {{yes|[https://mapcomplete.osm.be/ ${auth}]}} |image= MapComplete_Screenshot.png |genre= POI, editor, ${layout.id} }}`