data/mapsforge/default.xml

@@ -1006,7 +1006,7 @@
         <rule e="any" k="amenity" v="police" zoom-min="17">
             <symbol src=":/mapsforge/symbols/amenity/police2.svg" />
         </rule>
-        <rule e="any" k="amenity|building" v="fire_station" zoom-min="17">
+        <rule e="any" k="amenity" v="fire_station" zoom-min="17">
             <symbol src=":/mapsforge/symbols/amenity/firestation3.svg" />
         </rule>
     </rule>

src/map/IMG/rastertile.cpp

@@ -17,11 +17,6 @@ using namespace IMG;
 #define AREA(rect) \
 	(rect.size().width() * rect.size().height())
 
-#define HIDPI_IMG(dir, basename, ratio) \
-	(((ratio) > 1.0) \
-		? QImage(dir "/" basename "@2x.png") \
-		: QImage(dir "/" basename ".png"))
-
 #define ROAD  0
 #define WATER 1
 
@@ -451,8 +446,10 @@ void RasterTile::render()
 	QList<TextItem*> textItems;
 	QImage arrows[2];
 
-	arrows[ROAD] = HIDPI_IMG(":/map", "arrow", _ratio);
-	arrows[WATER] = HIDPI_IMG(":/map", "water-arrow", _ratio);
+	arrows[ROAD] = (_ratio > 1.0)
+	  ? QImage(":/map/arrow@2x.png") : QImage(":/map/arrow.png");
+	arrows[WATER] = (_ratio > 1.0)
+	  ? QImage(":/map/water-arrow@2x.png") : QImage(":/map/water-arrow.png");
 
 	fetchData(polygons, lines, points);
 	ll2xy(polygons);