lang/gpxsee_ca.ts

@@ -866,7 +866,7 @@
         <location filename="../src/GUI/gui.cpp" line="907"/>
         <location filename="../src/GUI/gui.cpp" line="925"/>
         <source>CRS directory:</source>
-        <translation>Directori CRS:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="909"/>
@@ -1020,7 +1020,6 @@
         <translation>
             <numerusform>%n fitxer</numerusform>
             <numerusform>%n fitxers</numerusform>
-            <numerusform>%n fitxers</numerusform>
         </translation>
     </message>
 </context>

lang/gpxsee_nb.ts

@@ -712,7 +712,7 @@
         <location filename="../src/GUI/gui.cpp" line="907"/>
         <location filename="../src/GUI/gui.cpp" line="925"/>
         <source>CRS directory:</source>
-        <translation>CRS-mappe:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="913"/>
@@ -1718,12 +1718,12 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="70"/>
         <source>Select the proper coordinate reference system (CRS) of maps without a CRS definition (JNX, KMZ and World file maps).</source>
-        <translation>Velg riktig koordinatreferansesystem (CRS) for kart uten en CRS-definisjon (JNX, KMZ og World-file kart).</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="73"/>
         <source>Select the desired projection of vector maps (IMG, Mapsforge and ENC maps). The projection must be valid for the whole map area.</source>
-        <translation>Velg ønsket projeksjon for vektorkart (IMG, Mapsforge og ENC-kart). Projeksjonen må være gyldig for hele kartområdet.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="104"/>

src/common/hash.h

@@ -6,13 +6,13 @@
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #define HASH_T uint
-
-inline uint qHash(const QPoint &p)
-{
-	return qHash(QPair<int, int>(p.x(), p.y()));
-}
 #else // QT6
 #define HASH_T size_t
 #endif // QT6
 
+inline HASH_T qHash(const QPoint &p)
+{
+	return ::qHash(p.x()) ^ ::qHash(p.y());
+}
+
 #endif // HASH_H

src/map/IMG/rgnfile.cpp

@@ -1,6 +1,5 @@
 #include "common/rectc.h"
 #include "common/garmin.h"
-#include "common/hash.h"
 #include "deltastream.h"
 #include "huffmanstream.h"
 #include "style.h"
@@ -14,10 +13,12 @@ using namespace IMG;
 
 #define MASK(bits) ((1U << (bits)) - 1U)
 
-static quint64 pointId(const QPoint &pos, quint32 type, const QString &label)
+static quint64 pointId(const QPoint &pos, quint32 type)
 {
-	quint64 hash = qHash(pos) ^ qHash(label);
-	quint64 id = ((quint64)type)<<40 | (hash & 0xFFFFFFFFFF);
+	quint64 id;
+
+	uint hash = (uint)qHash(QPair<int, int>(pos.x(), pos.y()));
+	id = ((quint64)type)<<32 | hash;
 
 	// Increase rendering priorities for some special items
 	if (!Style::isCountry(type) && !Style::isMarina(type))
@@ -483,11 +484,11 @@ bool RGNFile::pointObjects(Handle &hdl, const SubDiv *subdiv,
 
 		point.type = (quint16)type<<8 | subtype;
 		point.coordinates = Coordinates(toWGS24(pos.x()), toWGS24(pos.y()));
+		point.id = pointId(pos, point.type);
 		if (lbl && (labelPtr & 0x3FFFFF))
 			point.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF,
 			  labelPtr & 0x400000, !(Style::isCountry(point.type)
 			  || Style::isState(point.type)), Style::isSpot(point.type));
-		point.id = pointId(pos, point.type, point.label.text());
 
 		points->append(point);
 	}
@@ -536,9 +537,9 @@ bool RGNFile::extPointObjects(Handle &hdl, const SubDiv *subdiv,
 			continue;
 
 		point.coordinates = Coordinates(toWGS24(p.x()), toWGS24(p.y()));
+		point.id = pointId(p, point.type);
 		if (lbl && (labelPtr & 0x3FFFFF))
 			point.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF);
-		point.id = pointId(p, point.type, point.label.text());
 
 		points->append(point);
 	}