From b61bc6de7cb66fa5fdadb21067f80fb29cd5ecc9 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 14 Aug 2025 15:14:47 +0200 Subject: [PATCH 1/7] Fix: fix statistics --- src/UI/Statistics/AllStats.svelte | 1 + src/UI/Statistics/ChangesetsOverview.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/UI/Statistics/AllStats.svelte b/src/UI/Statistics/AllStats.svelte index 1dc2c3b13..4cea50cf3 100644 --- a/src/UI/Statistics/AllStats.svelte +++ b/src/UI/Statistics/AllStats.svelte @@ -18,6 +18,7 @@ import { DownloadIcon } from "@rgossiaux/svelte-heroicons/solid" import { GeoOperations } from "../../Logic/GeoOperations" import Filter from "../../assets/svg/Filter.svelte" + import { Lists } from "../../Utils/Lists" export let paths: string[] diff --git a/src/UI/Statistics/ChangesetsOverview.ts b/src/UI/Statistics/ChangesetsOverview.ts index 3485f1f3b..b42ad90ea 100644 --- a/src/UI/Statistics/ChangesetsOverview.ts +++ b/src/UI/Statistics/ChangesetsOverview.ts @@ -1,6 +1,6 @@ -import { Utils } from "../../Utils" import { Feature, Polygon } from "geojson" import { OsmFeature } from "../../Models/OsmFeature" +import { Lists } from "../../Utils/Lists" export interface ChangeSetData extends Feature { id: number From e2fc678ec9e694578927f0c7aeab86a0298041d4 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 15 Aug 2025 02:30:12 +0200 Subject: [PATCH 2/7] Fix: fix crash in collection times picker --- langs/en.json | 3 +++ .../Helpers/CollectionTimes/SingleCollectionTime.svelte | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/langs/en.json b/langs/en.json index 52612c248..cf32b82b9 100644 --- a/langs/en.json +++ b/langs/en.json @@ -22,6 +22,9 @@ "retrying": "Loading data failed. Trying again in {count} seconds…", "zoomIn": "Zoom in to view or edit the data" }, + "collectionTimes": { + "addTime": "Add moment" + }, "communityIndex": { "available": "This community speaks {native}", "intro": "Get in touch with other people to get to know them, learn from them, …", diff --git a/src/UI/InputElement/Helpers/CollectionTimes/SingleCollectionTime.svelte b/src/UI/InputElement/Helpers/CollectionTimes/SingleCollectionTime.svelte index 55d228742..23ddf4515 100644 --- a/src/UI/InputElement/Helpers/CollectionTimes/SingleCollectionTime.svelte +++ b/src/UI/InputElement/Helpers/CollectionTimes/SingleCollectionTime.svelte @@ -8,6 +8,7 @@ import { OH } from "../../../OpeningHours/OpeningHours" import { Lists } from "../../../../Utils/Lists" import { Translation } from "../../../i18n/Translation" + import PlusCircle from "@babeard/svelte-heroicons/mini/PlusCircle" export let value: UIEventSource @@ -114,7 +115,7 @@ }} > - Add time +
From d9815cae46eff6acf4fb75823570a3af37317f52 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 15 Aug 2025 02:31:10 +0200 Subject: [PATCH 3/7] chore(release): 0.55.2 --- CHANGELOG.md | 8 ++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 990c528d3..5c855f092 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [0.55.2](https://source.mapcomplete.org/MapComplete/MapComplete/compare/v0.55.1...v0.55.2) (2025-08-15) + + +### Bug Fixes + +* fix crash in collection times picker ([e2fc678](https://source.mapcomplete.org/MapComplete/MapComplete/commits/e2fc678ec9e694578927f0c7aeab86a0298041d4)) +* fix statistics ([b61bc6d](https://source.mapcomplete.org/MapComplete/MapComplete/commits/b61bc6de7cb66fa5fdadb21067f80fb29cd5ecc9)) + ### [0.55.1](https://source.mapcomplete.org/MapComplete/MapComplete/compare/v0.54.7...v0.55.1) (2025-08-13) diff --git a/package-lock.json b/package-lock.json index d27685ab8..38b2c5a1a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mapcomplete", - "version": "0.55.1", + "version": "0.55.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mapcomplete", - "version": "0.55.1", + "version": "0.55.2", "hasInstallScript": true, "license": "GPL-3.0-or-later", "dependencies": { diff --git a/package.json b/package.json index e89aa560b..9f5a0dd3b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mapcomplete", - "version": "0.55.1", + "version": "0.55.2", "repository": "https://source.mapcomplete.org/MapComplete/MapComplete", "description": "A small website to edit OSM easily", "bugs": "hhttps://source.mapcomplete.org/MapComplete/MapComplete/issues", From 1cbf9a71ac0203bdd10cf7d8b18d1884822f41b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Jel=C3=ADnek?= Date: Thu, 14 Aug 2025 09:37:45 +0000 Subject: [PATCH 4/7] Translated using Weblate (Czech) Currently translated at 100.0% (4639 of 4639 strings) Translation: MapComplete/layers Translate-URL: https://translate.mapcomplete.org/projects/mapcomplete/layers/cs/ --- langs/layers/cs.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/langs/layers/cs.json b/langs/layers/cs.json index 067e08c2a..de63abc19 100644 --- a/langs/layers/cs.json +++ b/langs/layers/cs.json @@ -7465,7 +7465,7 @@ } }, "lighthouse": { - "name": "maják", + "name": "Majáky", "presets": { "0": { "title": "maják" @@ -7483,7 +7483,7 @@ "then": "{name}" } }, - "render": "maják" + "render": "Maják" } }, "love_hotel": { From b102c690d1ad55cd5dbf862584c2f458848aa85b Mon Sep 17 00:00:00 2001 From: Supaplex Date: Fri, 15 Aug 2025 05:07:09 +0000 Subject: [PATCH 5/7] Translated using Weblate (Chinese (Traditional Han script)) Currently translated at 7.9% (367 of 4639 strings) Translation: MapComplete/layers Translate-URL: https://translate.mapcomplete.org/projects/mapcomplete/layers/zh_Hant/ --- langs/layers/zh_Hant.json | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/langs/layers/zh_Hant.json b/langs/layers/zh_Hant.json index 99b50dcb9..53612bccf 100644 --- a/langs/layers/zh_Hant.json +++ b/langs/layers/zh_Hant.json @@ -1072,7 +1072,8 @@ }, "question": "這家商店提供戀物癖裝備嗎？" } - } + }, + "name": "商家" }, "sports_centre": { "tagRenderings": { @@ -1275,5 +1276,18 @@ }, "render": "風機" } + }, + "speed_camera": { + "title": { + "render": "測速照相" + }, + "tagRenderings": { + "maxspeed": { + "question": "這個測速照相允許的最高速限？" + } + } + }, + "police_call_box": { + "name": "警察詢問室" } -} \ No newline at end of file +} From 3c8ec10139aec189c5bc98b6df6b7759afefa187 Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 15 Aug 2025 10:36:03 +0000 Subject: [PATCH 6/7] Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: MapComplete/layers Translate-URL: https://translate.mapcomplete.org/projects/mapcomplete/layers/ --- langs/layers/nl.json | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 03ff99a8e..47b84eb7a 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -2189,9 +2189,6 @@ }, "title": { "mappings": { - "0": { - "then": "{name}" - }, "1": { "then": "Vogelkijkhut {name}" }, @@ -7265,11 +7262,6 @@ } }, "title": { - "mappings": { - "0": { - "then": "{name}" - } - }, "render": "Natuurgebied" } }, @@ -7803,21 +7795,6 @@ "render": "Picknicktafel" } }, - "play_forest": { - "description": "Een speelbos is een vrij toegankelijke zone in een bos", - "name": "Speelbossen", - "title": { - "mappings": { - "0": { - "then": "{name}" - }, - "1": { - "then": "Speelbos {name}" - } - }, - "render": "Speelbos" - } - }, "playground": { "deletion": { "nonDeleteMappings": { @@ -9618,9 +9595,6 @@ }, "title": { "mappings": { - "0": { - "then": "{name}" - }, "1": { "then": "Voetpad" }, @@ -11879,16 +11853,7 @@ } }, "village_green": { - "description": "Een laag die dorpsgroen toont (gemeenschapsgroen, maar niet echt een park)", - "name": "Speelweide", - "title": { - "mappings": { - "0": { - "then": "{name}" - } - }, - "render": "Speelweide" - } + "description": "Een laag die dorpsgroen toont (gemeenschapsgroen, maar niet echt een park)" }, "visitor_information_centre": { "description": "Een bezoekerscentrum biedt informatie over een specifieke attractie of bezienswaardigheid waar het is gevestigd.", @@ -12100,4 +12065,4 @@ "render": "windturbine" } } -} \ No newline at end of file +} From 23e5849b61e4176e85a8b4e493f6fa6726105b2c Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 15 Aug 2025 15:59:29 +0200 Subject: [PATCH 7/7] App: add google play badge on download page, update text --- app/AppIndex.svelte | 12 ++- app/build_and_deploy.sh | 2 + app/googleplay.svg | 193 ++++++++++++++++++++++++++++++++++++++++ langs/cs.json | 1 - langs/da.json | 1 - langs/de.json | 1 - langs/en.json | 3 +- langs/fr.json | 1 - langs/it.json | 1 - langs/nl.json | 1 - langs/zh_Hant.json | 1 - 11 files changed, 208 insertions(+), 9 deletions(-) create mode 100644 app/googleplay.svg diff --git a/app/AppIndex.svelte b/app/AppIndex.svelte index a0d1a8f89..0f5e6c02c 100644 --- a/app/AppIndex.svelte +++ b/app/AppIndex.svelte @@ -9,8 +9,9 @@ const t = Translations.t.app const lng = Locale.language let fdroid = t.downloadOnFDroid.current + let googleplay = t.getOnGoogle.current - let supportedVersions: { version: number; codename: string } = [ + let supportedVersions: { version: number; codename: string }[] = [ { version: 9, codename: "pie" }, { version: 10, codename: "quince-tart" }, { version: 11, codename: "red-velvet-cake" }, @@ -80,6 +81,15 @@ /> + + {$googleplay} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/langs/cs.json b/langs/cs.json index 008ce1840..910d00e3c 100644 --- a/langs/cs.json +++ b/langs/cs.json @@ -7,7 +7,6 @@ "download": "Stáhnout aplikaci", "downloadOnFDroid": "Stáhnout MapComplete na F-Droidu", "getOnObtanium": "Získat na Obtainiu", - "intro": "MapComplete je k dispozici jako aplikace pro Android k přímému stažení. Pracujeme na to, aby byla zveřejněna i v repozitáři F-Droid.", "legacyExplanation": "Kvůli restrikcím společnosti Google nelze zkompilovat identický balíček APK pro novější i starší verze systému Android.\n\n Pokud instalace z F-Droidu, Google Play, Obtainia nebo instalace výše odkazované nejnovější verze ('latest') selže,\n zkuste balíčky pro starší verze Androidu, které jsou k dispozici níže.", "legacyHeader": "Sestavení pro starší telefony se systémem Android", "noPlayServices": "Aplikace funguje bez Google Play Services", diff --git a/langs/da.json b/langs/da.json index 1560d1b48..a865c34c8 100644 --- a/langs/da.json +++ b/langs/da.json @@ -7,7 +7,6 @@ "download": "Download appen", "downloadOnFDroid": "Download MapComplete på F-Droid", "getOnObtanium": "Hent på Obtainium", - "intro": "MapComplete er tilgængelig som Android-app som direkte download. Vi arbejder på også at udgive den på FDroid.", "noPlayServices": "Appen fungerer uden Google Play Services", "older": "Se ældre builds", "title": "MapComplete Android-app" diff --git a/langs/de.json b/langs/de.json index 030d3fb36..896e10041 100644 --- a/langs/de.json +++ b/langs/de.json @@ -5,7 +5,6 @@ "app": { "back": "Zurück zu MapComplete", "download": "Lade die App runter", - "intro": "MapComplete gibt's als Android-App zum direkten Download. Wir arbeiten daran, die App auch auf FDroid zu veröffentlichen.", "noPlayServices": "Die App funktioniert ohne Google Play Services", "older": "Ältere Versionen ansehen", "title": "MapComplete Android-App" diff --git a/langs/en.json b/langs/en.json index cf32b82b9..5bddac13c 100644 --- a/langs/en.json +++ b/langs/en.json @@ -6,8 +6,9 @@ "back": "Go back to MapComplete", "download": "Download the app", "downloadOnFDroid": "Download MapComplete on F-Droid", + "getOnGoogle": "Download MapComplete on Google Playstore", "getOnObtanium": "Get on Obtainium", - "intro": "MapComplete is available as Android App as direct download. We are working on publishing this in on FDroid too.", + "intro": "MapComplete is available as Android App on various app stores. Installing the app version makes it easier to access MapComplete and uses less internet. However, the web version has the same features.", "legacyExplanation": "Due to restrictions by Google, it is not possible to compile an identical APK for newer and older Android versions.\nIf installing via F-Droid, Google Play, Obtainium or installing 'latest' above failed, try a versions for older versions of android are available below.", "legacyHeader": "Builds for older Android phones", "noPlayServices": "The app works without Google Play Services", diff --git a/langs/fr.json b/langs/fr.json index fccf766da..04ba175d9 100644 --- a/langs/fr.json +++ b/langs/fr.json @@ -7,7 +7,6 @@ "download": "Télécharger l'application", "downloadOnFDroid": "Télécharger MapComplete sur F-Droid", "getOnObtanium": "Obtenir sur Obtainium", - "intro": "MapComplete est disponible en tant qu'application Android en téléchargement direct. Nous nous efforçons de publier également cette application sur FDroid.", "legacyExplanation": "En raison des restrictions imposées par Google, il n'est pas possible de compiler un APK identique pour les versions Android récentes et anciennes.\nSi l'installation via F-Droid, Google Play, Obtainium ou l'installation de la « dernière version » ci-dessus a échoué, essayez une des versions pour les anciennes versions d'Android disponibles ci-dessous.", "legacyHeader": "Versions pour les anciens téléphones Android", "noPlayServices": "L'application fonctionne sans Google Play Services", diff --git a/langs/it.json b/langs/it.json index e57972b3a..50c9ed566 100644 --- a/langs/it.json +++ b/langs/it.json @@ -5,7 +5,6 @@ "app": { "back": "Ritorna a MapComplete", "download": "Scarica l'app", - "intro": "MapComplete è disponibile come App Android in download diretto. Stiamo lavorando per pubblicarla anche su FDroid.", "noPlayServices": "L'app funziona senza Google Play Services", "older": "Vedi le vecchie versioni", "title": "MapComplete App per Android" diff --git a/langs/nl.json b/langs/nl.json index bafd298b4..f0c0c7d26 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -6,7 +6,6 @@ "back": "Ga terug naar MapComplete", "download": "Download de laatste versie", "downloadOnFDroid": "Download MapComplete op F-Droid", - "intro": "MapComplete is beschikbaar als Android App. Deze is binnenkort ook in F-Droid beschikbaar", "older": "Bekijk oudere versies", "title": "MapComplete Anrdoid App" }, diff --git a/langs/zh_Hant.json b/langs/zh_Hant.json index 38b9cf7bd..4ecd6d947 100644 --- a/langs/zh_Hant.json +++ b/langs/zh_Hant.json @@ -7,7 +7,6 @@ "download": "下載應用程式", "downloadOnFDroid": "在 F-Droid 下載 MapComplete", "getOnObtanium": "從 Obtainium 取得", - "intro": "MapComplete可以在Android App直接下載。我們也計畫在Fdroid發佈。", "legacyExplanation": "由於Google的限制，並無法為更新與更舊的Android編譯相同的APK\n 版本。\n\n 如果你透過F-Droid、Google Play、Obtainium或是安裝「最新」的版本失敗，\n 請為其他較舊Android版本使用其他版本。", "legacyHeader": "為較舊Android手機建構", "noPlayServices": "本應用無需 Google Play 服務即可運行",