Bug#1110066: unblock: kosmindoormap/25.04.3-1
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: kosmindoormap@packages.debian.org
Control: affects -1 + src:kosmindoormap
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear Release Team,
please unblock package kosmindoormap.
[ Reason ]
It contains the following changes:
* New upstream release (25.04.3).
- Be slightly more clever when fixing level tag separator errors.
- Also find standard-compliant free-floating platform section signs.
- Extend area rules for various elevator tagging schemes.
[ Tests ]
- Upstream test suite passes in sbuild.
- Tested displaying and searching inside indoor map in Kongress.
[ Risks ]
Only contains the latest upstream point release for the 25.04 Gear
branch. Further fixes can easily be backported or the change reverted.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
Thanks !
unblock kosmindoormap/25.04.3-1
diff -Nru kosmindoormap-25.04.0/autotests/levelparsertest.cpp kosmindoormap-25.04.3/autotests/levelparsertest.cpp
--- kosmindoormap-25.04.0/autotests/levelparsertest.cpp 2025-04-07 23:50:29.000000000 +0200
+++ kosmindoormap-25.04.3/autotests/levelparsertest.cpp 2025-06-30 18:48:48.000000000 +0200
@@ -43,6 +43,7 @@
// invalid but we have workarounds for this
QTest::newRow("1,5") << "1,5" << LV{15};
+ QTest::newRow("0,-1") << "0,-1" << LV{0,-10};
}
void testLevelParse()
diff -Nru kosmindoormap-25.04.0/CMakeLists.txt kosmindoormap-25.04.3/CMakeLists.txt
--- kosmindoormap-25.04.0/CMakeLists.txt 2025-04-07 23:50:29.000000000 +0200
+++ kosmindoormap-25.04.3/CMakeLists.txt 2025-06-30 18:48:48.000000000 +0200
@@ -6,7 +6,7 @@
# KDE Application Version, managed by release script
set (RELEASE_SERVICE_VERSION_MAJOR "25")
set (RELEASE_SERVICE_VERSION_MINOR "04")
-set (RELEASE_SERVICE_VERSION_MICRO "0")
+set (RELEASE_SERVICE_VERSION_MICRO "3")
set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
project(KOSMIndoorMap VERSION ${RELEASE_SERVICE_VERSION})
@@ -45,7 +45,12 @@
endif()
if (NOT BUILD_TOOLS_ONLY)
- find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Quick)
+ find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Gui Quick)
+
+ if (Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0")
+ find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
+ endif()
+
find_package(KF6 REQUIRED COMPONENTS I18n)
find_package(KPublicTransport)
set_package_properties(KPublicTransport PROPERTIES TYPE ${KPublicTransport_DEPENDENCY_TYPE} PURPOSE "Integration of public transport realtime data.")
diff -Nru kosmindoormap-25.04.0/debian/changelog kosmindoormap-25.04.3/debian/changelog
--- kosmindoormap-25.04.0/debian/changelog 2025-04-17 22:28:04.000000000 +0200
+++ kosmindoormap-25.04.3/debian/changelog 2025-07-27 13:23:31.000000000 +0200
@@ -1,3 +1,13 @@
+kosmindoormap (25.04.3-1) unstable; urgency=medium
+
+ [ Aurélien COUDERC ]
+ * New upstream release (25.04.3).
+ - Be slightly more clever when fixing level tag separator errors.
+ - Also find standard-compliant free-floating platform section signs.
+ - Extend area rules for various elevator tagging schemes.
+
+ -- Aurélien COUDERC <coucouf@debian.org> Sun, 27 Jul 2025 13:23:31 +0200
+
kosmindoormap (25.04.0-1) unstable; urgency=medium
[ Aurélien COUDERC ]
diff -Nru kosmindoormap-25.04.0/.flatpak-manifest.json kosmindoormap-25.04.3/.flatpak-manifest.json
--- kosmindoormap-25.04.0/.flatpak-manifest.json 2025-04-07 23:50:29.000000000 +0200
+++ kosmindoormap-25.04.3/.flatpak-manifest.json 2025-06-30 18:48:48.000000000 +0200
@@ -23,8 +23,8 @@
"sources": [
{
"type": "archive",
- "url": "https://download.kde.org/stable/kirigami-addons/kirigami-addons-1.5.0.tar.xz";,
- "sha256": "f9dfd191022b633ea3348f84730d7158a159dfe49668dba0a9e9bd678ac44e54"
+ "url": "https://download.kde.org/stable/kirigami-addons/kirigami-addons-1.7.0.tar.xz";,
+ "sha256": "7d854975185cf740de486d84f1e2ec3e4eadb66ac9fb897214cba9ab8cc492b1"
}
],
"cleanup": [
diff -Nru kosmindoormap-25.04.0/po/ca/kosmindoormap.po kosmindoormap-25.04.3/po/ca/kosmindoormap.po
--- kosmindoormap-25.04.0/po/ca/kosmindoormap.po 2025-04-07 23:50:29.000000000 +0200
+++ kosmindoormap-25.04.3/po/ca/kosmindoormap.po 2025-06-30 18:48:48.000000000 +0200
@@ -1,15 +1,15 @@
# Translation of kosmindoormap.po to Catalan
-# Copyright (C) 2020-2024 This_file_is_part_of_KDE
+# Copyright (C) 2020-2025 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
-# SPDX-FileCopyrightText: 2020, 2021, 2022, 2023, 2024 Josep M. Ferrer <txemaq@gmail.com>
+# SPDX-FileCopyrightText: 2020, 2021, 2022, 2023, 2024, 2025 Josep M. Ferrer <txemaq@gmail.com>
msgid ""
msgstr ""
"Project-Id-Version: kosmindoormap\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2024-11-09 00:39+0000\n"
-"PO-Revision-Date: 2024-06-30 08:50+0200\n"
+"PO-Revision-Date: 2025-05-31 18:51+0200\n"
"Last-Translator: Josep M. Ferrer <txemaq@gmail.com>\n"
"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
"Language: ca\n"
@@ -18,7 +18,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Accelerator-Marker: &\n"
-"X-Generator: Lokalize 24.05.1\n"
+"X-Generator: Lokalize 22.12.3\n"
#: app/main.cpp:70
#, kde-format
@@ -53,7 +53,7 @@
#, kde-format
msgctxt "amenity category"
msgid "Amenities"
-msgstr "Articles de cortesia"
+msgstr "Serveis"
#: map-quick/amenitymodel.cpp:99
#, kde-format
diff -Nru kosmindoormap-25.04.0/po/ca@valencia/kosmindoormap.po kosmindoormap-25.04.3/po/ca@valencia/kosmindoormap.po
--- kosmindoormap-25.04.0/po/ca@valencia/kosmindoormap.po 2025-04-07 23:50:29.000000000 +0200
+++ kosmindoormap-25.04.3/po/ca@valencia/kosmindoormap.po 2025-06-30 18:48:48.000000000 +0200
@@ -1,15 +1,15 @@
# Translation of kosmindoormap.po to Catalan (Valencian)
-# Copyright (C) 2020-2024 This_file_is_part_of_KDE
+# Copyright (C) 2020-2025 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
-# SPDX-FileCopyrightText: 2020, 2021, 2022, 2023, 2024 Josep M. Ferrer <txemaq@gmail.com>
+# SPDX-FileCopyrightText: 2020, 2021, 2022, 2023, 2024, 2025 Josep M. Ferrer <txemaq@gmail.com>
msgid ""
msgstr ""
"Project-Id-Version: kosmindoormap\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2024-11-09 00:39+0000\n"
-"PO-Revision-Date: 2024-06-30 08:50+0200\n"
+"PO-Revision-Date: 2025-05-31 18:51+0200\n"
"Last-Translator: Josep M. Ferrer <txemaq@gmail.com>\n"
"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
"Language: ca@valencia\n"
@@ -18,7 +18,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Accelerator-Marker: &\n"
-"X-Generator: Lokalize 24.05.1\n"
+"X-Generator: Lokalize 22.12.3\n"
#: app/main.cpp:70
#, kde-format
@@ -53,7 +53,7 @@
#, kde-format
msgctxt "amenity category"
msgid "Amenities"
-msgstr "Articles de cortesia"
+msgstr "Serveis"
#: map-quick/amenitymodel.cpp:99
#, kde-format
diff -Nru kosmindoormap-25.04.0/po/fr/kosmindoormap.po kosmindoormap-25.04.3/po/fr/kosmindoormap.po
--- kosmindoormap-25.04.0/po/fr/kosmindoormap.po 2025-04-07 23:50:29.000000000 +0200
+++ kosmindoormap-25.04.3/po/fr/kosmindoormap.po 2025-06-30 18:48:48.000000000 +0200
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2020, 2021, 2022, 2023, 2024 Xavier Besnard <xavier.besnard@kde.org>
+# SPDX-FileCopyrightText: 2020, 2021, 2022, 2023, 2024, 2025 Xavier Besnard <xavier.besnard@kde.org>
# Xavier Besnard <xavier.besnard@kde.org>, 2023.
msgid ""
msgstr ""
@@ -13,7 +13,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 23.08.5\n"
+"X-Generator: Lokalize 25.04.2\n"
#: app/main.cpp:70
#, kde-format
diff -Nru kosmindoormap-25.04.0/po/gl/kosmindoormap.po kosmindoormap-25.04.3/po/gl/kosmindoormap.po
--- kosmindoormap-25.04.0/po/gl/kosmindoormap.po 2025-04-07 23:50:29.000000000 +0200
+++ kosmindoormap-25.04.3/po/gl/kosmindoormap.po 2025-06-30 18:48:48.000000000 +0200
@@ -1,7 +1,7 @@
# Copyright (C) 2024 This file is copyright:
# This file is distributed under the same license as the kosmindoormap package.
#
-# SPDX-FileCopyrightText: 2024 Adrián Chaves (Gallaecio)
+# SPDX-FileCopyrightText: 2024, 2025 Adrián Chaves (Gallaecio)
msgid ""
msgstr ""
"Project-Id-Version: kosmindoormap\n"
@@ -15,7 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 24.08.3\n"
+"X-Generator: Lokalize 25.04.2\n"
#: app/main.cpp:70
#, kde-format
diff -Nru kosmindoormap-25.04.0/po/it/kosmindoormap.po kosmindoormap-25.04.3/po/it/kosmindoormap.po
--- kosmindoormap-25.04.0/po/it/kosmindoormap.po 2025-04-07 23:50:29.000000000 +0200
+++ kosmindoormap-25.04.3/po/it/kosmindoormap.po 2025-06-30 18:48:48.000000000 +0200
@@ -1,7 +1,7 @@
# Copyright (C) 2023 This file is copyright:
# This file is distributed under the same license as the kosmindoormap package.
# Paolo Zamponi <feus73@gmail.com>, 2020.
-# SPDX-FileCopyrightText: 2022, 2023, 2024 Vincenzo Reale <smart2128vr@gmail.com>
+# SPDX-FileCopyrightText: 2022, 2023, 2024, 2025 Vincenzo Reale <smart2128vr@gmail.com>
#
msgid ""
msgstr ""
@@ -16,7 +16,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 24.05.1\n"
+"X-Generator: Lokalize 25.04.2\n"
#: app/main.cpp:70
#, kde-format
diff -Nru kosmindoormap-25.04.0/po/pl/kosmindoormap.po kosmindoormap-25.04.3/po/pl/kosmindoormap.po
--- kosmindoormap-25.04.0/po/pl/kosmindoormap.po 2025-04-07 23:50:29.000000000 +0200
+++ kosmindoormap-25.04.3/po/pl/kosmindoormap.po 2025-06-30 18:48:48.000000000 +0200
@@ -16,7 +16,6 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 23.08.5\n"
#: app/main.cpp:70
#, kde-format
diff -Nru kosmindoormap-25.04.0/src/app/org.kde.kosmindoormap.appdata.xml kosmindoormap-25.04.3/src/app/org.kde.kosmindoormap.appdata.xml
--- kosmindoormap-25.04.0/src/app/org.kde.kosmindoormap.appdata.xml 2025-04-07 23:50:29.000000000 +0200
+++ kosmindoormap-25.04.3/src/app/org.kde.kosmindoormap.appdata.xml 2025-06-30 18:48:48.000000000 +0200
@@ -117,6 +117,9 @@
</provides>
<launchable type="desktop-id">org.kde.kosmindoormap.desktop</launchable>
<releases>
+ <release version="25.04.3" date="2025-07-03"/>
+ <release version="25.04.2" date="2025-06-05"/>
+ <release version="25.04.1" date="2025-05-08"/>
<release version="25.04.0" date="2025-04-17"/>
<release version="24.12.3" date="2025-03-06"/>
<release version="24.12.2" date="2025-02-06"/>
diff -Nru kosmindoormap-25.04.0/src/map/content/platformfinder.cpp kosmindoormap-25.04.3/src/map/content/platformfinder.cpp
--- kosmindoormap-25.04.0/src/map/content/platformfinder.cpp 2025-04-07 23:50:29.000000000 +0200
+++ kosmindoormap-25.04.3/src/map/content/platformfinder.cpp 2025-06-30 18:48:48.000000000 +0200
@@ -48,9 +48,25 @@
continue;
}
+ // free floating section signs
+ const auto elemPt = e.tagValue(m_tagKeys.public_transport);
+ if (elemPt == "platform_section_sign") {
+ const auto platformRef = e.tagValue(m_tagKeys.platform_ref);
+ const auto ref = e.tagValue("ref");
+ if (!platformRef.isEmpty() && !ref.isEmpty()) {
+ Platform p;
+ p.setLevel(levelForPlatform((*it).first, e));
+ p.setName(QString::fromUtf8(platformRef));
+ PlatformSection section;
+ section.setName(QString::fromUtf8(ref));
+ section.setPosition(e);
+ p.setSections({section});
+ m_floatingSections.push_back(std::move(p));
+ }
+ }
+
// non-standard free-floating section signs
- const auto platformRef = e.tagValue(m_tagKeys.platform_colon_ref);
- if (!platformRef.isEmpty() && e.tagValue("pole") == "landmark_sign") {
+ if (const auto platformRef = e.tagValue(m_tagKeys.platform_colon_ref); !platformRef.isEmpty() && e.tagValue("pole") == "landmark_sign") {
const auto names = QString::fromUtf8(platformRef).split(QLatin1Char(';'));
for (const auto &name : names) {
Platform p;
diff -Nru kosmindoormap-25.04.0/src/map/loader/levelparser.cpp kosmindoormap-25.04.3/src/map/loader/levelparser.cpp
--- kosmindoormap-25.04.0/src/map/loader/levelparser.cpp 2025-04-07 23:50:29.000000000 +0200
+++ kosmindoormap-25.04.3/src/map/loader/levelparser.cpp 2025-06-30 18:48:48.000000000 +0200
@@ -27,9 +27,15 @@
for (int i = 0; i < level.size(); ++i) {
auto &c = level[i];
- if (c == ',') { // fix decimal separator errors
+ if (c == ',') { // fix separator errors
qCDebug(Log) << "syntax error in level tag:" << level << e.url();
- c = '.';
+ // we assume ',' is meant as a decimal separator, as long as that's plausible
+ // TODO: multiple consecutive commas should also be treated as ; probably?
+ if (i < level.size() - 1 && !std::isdigit(static_cast<unsigned char>(level[i+1]))) {
+ c = ';';
+ } else {
+ c = '.';
+ }
}
if (std::isdigit(static_cast<unsigned char>(c)) || c == '.') {
diff -Nru kosmindoormap-25.04.0/src/map/style/mapcssstyle.cpp kosmindoormap-25.04.3/src/map/style/mapcssstyle.cpp
--- kosmindoormap-25.04.0/src/map/style/mapcssstyle.cpp 2025-04-07 23:50:29.000000000 +0200
+++ kosmindoormap-25.04.3/src/map/style/mapcssstyle.cpp 2025-06-30 18:48:48.000000000 +0200
@@ -22,6 +22,7 @@
// - keep value lists alphabetically sorted
// - follow rules linked on https://wiki.openstreetmap.org/wiki/Area
static constexpr inline const char* way_rule_highway_values[] = {
+ "elevator",
"platform",
"rest_area",
"services"
@@ -54,6 +55,8 @@
MapCSSStylePrivate::MapCSSStylePrivate()
: m_wayTypeRules({
{ OSM::TagKey{}, "building", MapCSSObjectType::Area, {}},
+ { OSM::TagKey{}, "building:levels", MapCSSObjectType::Area, {}},
+ { OSM::TagKey{}, "building:part", MapCSSObjectType::Area, {}},
{ OSM::TagKey{}, "highway", MapCSSObjectType::Area, std::span<const char* const>{way_rule_highway_values}},
{ OSM::TagKey{}, "natural", MapCSSObjectType::Area, std::span<const char* const>{way_rule_natural_values}},
})
diff -Nru kosmindoormap-25.04.0/src/map/style/mapcssstyle_p.h kosmindoormap-25.04.3/src/map/style/mapcssstyle_p.h
--- kosmindoormap-25.04.0/src/map/style/mapcssstyle_p.h 2025-04-07 23:50:29.000000000 +0200
+++ kosmindoormap-25.04.3/src/map/style/mapcssstyle_p.h 2025-06-30 18:48:48.000000000 +0200
@@ -43,7 +43,7 @@
MapCSSObjectType type;
std::span<const char* const> values;
};
- std::array<way_type_rule_t, 3> m_wayTypeRules;
+ std::array<way_type_rule_t, 5> m_wayTypeRules;
inline static MapCSSStylePrivate* get(MapCSSStyle *style) { return style->d.get(); }
};
Reply to: