.appveyor.yml

@@ -1,4 +1,4 @@
-version: 13.6.{build}
+version: 13.5.{build}
 
 configuration:
   - Release

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx:!android {
 } else {
     TARGET = GPXSee
 }
-VERSION = 13.6
+VERSION = 13.5
 
 
 QT += core \

gpxsee.qrc

@@ -58,9 +58,6 @@
 	<!-- Common map stuff -->
 	<qresource prefix="/map">
 		<file alias="arrow.png">icons/map/arrow.png</file>
-		<file alias="arrow@2x.png">icons/map/arrow@2x.png</file>
-		<file alias="water-arrow.png">icons/map/water-arrow.png</file>
-		<file alias="water-arrow@2x.png">icons/map/water-arrow@2x.png</file>
 	</qresource>
 
 	<!-- POIs (IMG & ENC style) -->

lang/gpxsee_ca.ts

@@ -1320,7 +1320,7 @@
     <message>
         <location filename="../src/GUI/motioninfoitem.cpp" line="87"/>
         <source>kn</source>
-        <translation>nus</translation>
+        <translation>km</translation>
     </message>
     <message>
         <location filename="../src/GUI/motioninfoitem.cpp" line="90"/>

lang/gpxsee_eo.ts

@@ -712,13 +712,13 @@
         <location filename="../src/GUI/gui.cpp" line="907"/>
         <location filename="../src/GUI/gui.cpp" line="925"/>
         <source>CRS directory:</source>
-        <translation>CRS-dosierujo:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="913"/>
         <location filename="../src/GUI/gui.cpp" line="931"/>
         <source>Symbols directory:</source>
-        <translation>Dosierujo de simboloj:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="960"/>

lang/gpxsee_fi.ts

@@ -425,7 +425,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="217"/>
         <source>Open directory...</source>
-        <translation>Avaa hakemisto…</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="236"/>
@@ -878,7 +878,7 @@
         <location filename="../src/GUI/gui.cpp" line="907"/>
         <location filename="../src/GUI/gui.cpp" line="925"/>
         <source>CRS directory:</source>
-        <translation>CRS-hakemisto:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="915"/>

lang/gpxsee_hu.ts

@@ -1019,7 +1019,6 @@
         <source>%n files</source>
         <translation>
             <numerusform>%n fájl</numerusform>
-            <numerusform>%n fájl</numerusform>
         </translation>
     </message>
 </context>

lang/gpxsee_ru.ts

@@ -878,7 +878,7 @@
         <location filename="../src/GUI/gui.cpp" line="907"/>
         <location filename="../src/GUI/gui.cpp" line="925"/>
         <source>CRS directory:</source>
-        <translation>Каталог CRS:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="915"/>
@@ -1428,12 +1428,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>Выберите правильную систему координат (CRS) для карт без определения CRS (форматы JNX, KMZ и World file).</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>Выберите нужную проекцию векторных карт (IMG, Mapsforge и ENC). Проекция должна быть действительна для всей области карты.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="77"/>

lang/gpxsee_uk.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:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="913"/>

pkg/windows/gpxsee64.nsi

@@ -37,7 +37,7 @@ Unicode true
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "13.6"
+!define VERSION "13.5"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"

src/map/IMG/rastertile.cpp

@@ -25,6 +25,12 @@ static const QColor shieldBgColor1("#dd3e3e");
 static const QColor shieldBgColor2("#379947");
 static const QColor shieldBgColor3("#4a7fc1");
 
+static const QImage *arrow()
+{
+	static QImage img(":/map/arrow.png");
+	return &img;
+}
+
 static QFont pixelSizeFont(int pixelSize)
 {
 	QFont f;
@@ -302,17 +308,17 @@ void RasterTile::processPolygons(const QList<MapData::Poly> &polygons,
 }
 
 void RasterTile::processLines(QList<MapData::Poly> &lines,
-  QList<TextItem*> &textItems, const QImage &arrow, const QImage &waterArrow)
+  QList<TextItem*> &textItems)
 {
 	std::stable_sort(lines.begin(), lines.end());
 
 	if (_zoom >= 22)
-		processStreetNames(lines, textItems, arrow, waterArrow);
+		processStreetNames(lines, textItems);
 	processShields(lines, textItems);
 }
 
 void RasterTile::processStreetNames(const QList<MapData::Poly> &lines,
-  QList<TextItem*> &textItems, const QImage &arrow, const QImage &waterArrow)
+  QList<TextItem*> &textItems)
 {
 	for (int i = 0; i < lines.size(); i++) {
 		const MapData::Poly &poly = lines.at(i);
@@ -328,9 +334,7 @@ void RasterTile::processStreetNames(const QList<MapData::Poly> &lines,
 		const QColor *color = style.textColor().isValid()
 		  ? &style.textColor() : 0;
 		const QColor *hColor = Style::isContourLine(poly.type) ? 0 : &haloColor;
-		const QImage *img = poly.oneway
-		  ? Style::isWaterLine(poly.type)
-			? &waterArrow : &arrow : 0;
+		const QImage *img = poly.oneway ? arrow() : 0;
 
 		TextPathItem *item = new TextPathItem(poly.points,
 		  &poly.label.text(), _rect, fnt, color, hColor, img);
@@ -475,10 +479,6 @@ void RasterTile::render()
 	QList<MapData::Poly> lines;
 	QList<MapData::Point> points;
 	QList<TextItem*> textItems;
-	QImage arrow = (_ratio >= 2)
-	  ? QImage(":/map/arrow@2x.png") : QImage(":/map/arrow.png");
-	QImage waterArrow = (_ratio >= 2)
-	  ? QImage(":/map/water-arrow@2x.png") : QImage(":/map/water-arrow.png");
 
 	fetchData(polygons, lines, points);
 	ll2xy(polygons);
@@ -487,7 +487,7 @@ void RasterTile::render()
 
 	processPoints(points, textItems);
 	processPolygons(polygons, textItems);
-	processLines(lines, textItems, arrow, waterArrow);
+	processLines(lines, textItems);
 
 	_pixmap.setDevicePixelRatio(_ratio);
 	_pixmap.fill(Qt::transparent);

src/map/IMG/rastertile.h

@@ -45,13 +45,13 @@ private:
 	void processPolygons(const QList<MapData::Poly> &polygons,
 	  QList<TextItem *> &textItems);
 	void processLines(QList<MapData::Poly> &lines,
-	  QList<TextItem*> &textItems, const QImage &arrow, const QImage &waterArrow);
+	  QList<TextItem*> &textItems);
 	void processPoints(QList<MapData::Point> &points,
 	  QList<TextItem*> &textItems);
 	void processShields(const QList<MapData::Poly> &lines,
 	  QList<TextItem*> &textItems);
 	void processStreetNames(const QList<MapData::Poly> &lines,
-	  QList<TextItem*> &textItems, const QImage &arrow, const QImage &waterArrow);
+	  QList<TextItem*> &textItems);
 
 	Projection _proj;
 	Transform _transform;

src/map/IMG/style.h

@@ -104,9 +104,6 @@ public:
 	static bool isWaterArea(quint32 type)
 	  {return ((type >= TYPE(0x3c) && type <= TYPE(0x44))
 	  || (type & 0xffff00) == TYPE(0x10b));}
-	static bool isWaterLine(quint32 type)
-	  {return (type == TYPE(0x26) || type == TYPE(0x18)
-	  || type == TYPE(0x1f));}
 	static bool isMilitaryArea(quint32 type)
 	  {return (type == TYPE(0x04) || type == 0x10901);}
 	static bool isNatureReserve(quint32 type)