Add "office" as used in OpenAndroMaps as an equivalent to Mapsforge's "civic"

Use jom for Windows CI builds
Update the nuber of cores acording to the latest GitHub runners state
2025-07-29 18:04:24 +02:00 · 2025-03-21 22:06:50 +01:00 · 2025-03-21 06:55:21 +01:00 · 2025-03-21 06:27:33 +01:00 · 2025-03-21 05:56:17 +01:00 · 2025-03-20 22:55:09 +01:00
8 changed files with 22 additions and 18 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -8,6 +8,7 @@ image:

 environment:
  NSISDIR: C:\Program Files (x86)\NSIS
+  JOMDIR: C:\Qt\Tools\QtCreator\bin\jom
  matrix:
  - QTDIR: C:\Qt\5.15\msvc2019_64
    OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
@ -17,14 +18,14 @@ environment:

 install:
 - cmd: |-
-    set PATH=%QTDIR%\bin;%NSISDIR%;%PATH%
+    set PATH=%QTDIR%\bin;%NSISDIR%;%JOMDIR%;%PATH%
    call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat

 build_script:
 - cmd: |-
    lrelease gpxsee.pro
    qmake gpxsee.pro
-    nmake release
+    jom release

    md installer
    copy release\GPXSee.exe installer
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@ -43,7 +43,7 @@ jobs:
      - name: Configure build
        run:  qmake gpxsee.pro OPENSSL_PATH=android_openssl 
      - name: Build project
-        run:  make -j2 apk
+        run:  make -j4 apk
      - name: Upload artifacts
        uses: actions/upload-artifact@v4
        with:
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@ -24,4 +24,4 @@ jobs:
      - name: Configure build
        run: qmake CONFIG+=${{ matrix.config }} gpxsee.pro
      - name: Build project
-        run: make -j2
+        run: make -j4
--- a/data/style/style.xml
+++ b/data/style/style.xml
@ -214,11 +214,11 @@
    </rule>

    <!-- Buildings -->
-    <rule e="way" k="building" v="-|civic|cathedral|church|basilica">
+    <rule e="way" k="building" v="-|civic|office|cathedral|church|basilica">
        <area fill="#dbd0b6" stroke="#cdccc4" stroke-width="0.1"/>
    </rule>

-    <rule e="way" k="building" v="civic">
+    <rule e="way" k="building" v="civic|office">
        <area fill="#cfc4b3" stroke="#cdccc4" stroke-width="0.1"/>
        <rule e="way" k="*" v="*" zoom-min="16">
            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" priority="-10"/>
--- a/lang/gpxsee_eo.ts
+++ b/lang/gpxsee_eo.ts
@ -172,7 +172,7 @@
    <message>
        <location filename="../src/data/data.cpp" line="251"/>
        <source>VTK files</source>
-        <translation type="unfinished"></translation>
+        <translation>VTK dosieroj</translation>
    </message>
    <message>
        <location filename="../src/data/data.cpp" line="252"/>
--- a/lang/gpxsee_fi.ts
+++ b/lang/gpxsee_fi.ts
@ -167,12 +167,12 @@
    <message>
        <location filename="../src/data/data.cpp" line="250"/>
        <source>70mai GPS log files</source>
-        <translation type="unfinished"></translation>
+        <translation>70mai GPS -lokitiedostot</translation>
    </message>
    <message>
        <location filename="../src/data/data.cpp" line="251"/>
        <source>VTK files</source>
-        <translation type="unfinished"></translation>
+        <translation>VTK-tiedostot</translation>
    </message>
    <message>
        <location filename="../src/data/data.cpp" line="252"/>
--- a/lang/gpxsee_ru.ts
+++ b/lang/gpxsee_ru.ts
@ -167,12 +167,12 @@
    <message>
        <location filename="../src/data/data.cpp" line="250"/>
        <source>70mai GPS log files</source>
-        <translation type="unfinished"></translation>
+        <translation>70mai GPS файлы</translation>
    </message>
    <message>
        <location filename="../src/data/data.cpp" line="251"/>
        <source>VTK files</source>
-        <translation type="unfinished"></translation>
+        <translation>VTK файлы</translation>
    </message>
    <message>
        <location filename="../src/data/data.cpp" line="252"/>
@ -837,7 +837,7 @@
    <message>
        <location filename="../src/GUI/gui.cpp" line="1126"/>
        <source>Error loading geo URI:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ошибка загрузки гео URI:</translation>
    </message>
    <message>
        <location filename="../src/GUI/gui.cpp" line="1132"/>
--- a/src/data/vtkparser.cpp
+++ b/src/data/vtkparser.cpp
@ -180,12 +180,15 @@ bool VTKParser::parse(QFile *file, QList<TrackData> &tracks,
 	_errorString = "";

 	while (true) {
-		len = file->read((char*)&recordLen, 2);
-		if (len < 0) {
-			_errorString = "I/O error";
-			return false;
-		} else if (len == 0)
-			break;
+		if ((len = file->read((char*)&recordLen, sizeof(recordLen)))
+		  != sizeof(recordLen)) {
+			if (!len)
+				break;
+			else {
+				_errorString = "Error reading VTK record size";
+				return false;
+			}
+		}

 		recordLen = qFromLittleEndian(recordLen);
 		ba.resize(recordLen);
Author	SHA1	Message	Date
Martin Tůma	355f451e5c	Add "office" as used in OpenAndroMaps as an equivalent to Mapsforge's "civic"	2025-03-21 22:06:50 +01:00
Martin Tůma	0b61fb0470	Use jom for Windows CI builds	2025-03-21 06:55:21 +01:00
Martin Tůma	af18c98a03	Update the nuber of cores acording to the latest GitHub runners state	2025-03-21 06:27:33 +01:00
Martin Tůma	e9a8112196	Fixed error handling	2025-03-21 05:56:17 +01:00
Nikolay Korotkiy	bca335d4b2	Translated using Weblate (Esperanto) Currently translated at 91.2% (448 of 491 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/	2025-03-20 22:55:09 +01:00
Nikolay Korotkiy	f3b1fa8eb7	Translated using Weblate (Russian) Currently translated at 100.0% (491 of 491 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/	2025-03-20 22:55:09 +01:00
Nikolay Korotkiy	fac377e746	Translated using Weblate (Finnish) Currently translated at 96.7% (475 of 491 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/	2025-03-20 22:55:09 +01:00