gpxsee.qrc

@@ -177,7 +177,6 @@
 		<file alias="fence-line.png">icons/map/marine/fence-line.png</file>
 		<file alias="crane.png">icons/map/marine/crane.png</file>
 		<file alias="distance-mark.png">icons/map/marine/distance-mark.png</file>
-		<file alias="distance-mark-land.png">icons/map/marine/distance-mark-land.png</file>
 		<file alias="conveyor-line.png">icons/map/marine/conveyor-line.png</file>
 		<file alias="pipeline-overhead.png">icons/map/marine/pipeline-overhead.png</file>
 		<file alias="coast-guard.png">icons/map/marine/coast-guard.png</file>
@@ -190,7 +189,6 @@
 		<file alias="entry-prohibited-line.png">icons/map/marine/entry-prohibited-line.png</file>
 		<file alias="cable-area-line.png">icons/map/marine/cable-area-line.png</file>
 		<file alias="pipeline-area-line.png">icons/map/marine/pipeline-area-line.png</file>
-		<file alias="windmotor.png">icons/map/marine/windmotor.png</file>
 	</qresource>
 
 	<!-- Mapsforge rendertheme -->

src/map/ENC/mapdata.cpp

@@ -49,18 +49,15 @@ static QMap<uint,uint> orderMapInit()
 	map.insert(TYPE(OBSTRN), 24);
 	map.insert(TYPE(WRECKS), 25);
 	map.insert(TYPE(UWTROC), 26);
-	map.insert(TYPE(I_TRNBSN), 27);
+	map.insert(TYPE(HRBFAC), 27);
-	map.insert(TYPE(HRBFAC), 28);
+	map.insert(TYPE(PILPNT), 28);
-	map.insert(TYPE(PILPNT), 29);
+	map.insert(TYPE(ACHBRT), 29);
-	map.insert(TYPE(ACHBRT), 30);
+	map.insert(TYPE(I_ACHBRT), 29);
-	map.insert(TYPE(I_ACHBRT), 30);
+	map.insert(TYPE(CRANES), 30);
-	map.insert(TYPE(CRANES), 31);
+	map.insert(TYPE(I_CRANES), 30);
-	map.insert(TYPE(I_CRANES), 31);
+	map.insert(TYPE(LNDMRK), 31);
-	map.insert(TYPE(LNDMRK), 32);
+	map.insert(TYPE(SILTNK), 32);
-	map.insert(TYPE(SILTNK), 33);
+	map.insert(TYPE(LNDELV), 33);
-	map.insert(TYPE(LNDELV), 34);
-	map.insert(TYPE(SMCFAC), 35);
-	map.insert(TYPE(BUISGL), 36);
 	map.insert(TYPE(I_DISMAR), 0xFFFFFFFE);
 	map.insert(TYPE(SOUNDG), 0xFFFFFFFF);
 

src/map/ENC/rastertile.cpp

@@ -208,26 +208,6 @@ void RasterTile::processPoints(QList<TextItem*> &textItems)
 
 	std::sort(_points.begin(), _points.end(), pointLess);
 
-	for (int i = 0; i < _polygons.size(); i++) {
-		const MapData::Poly *poly = _polygons.at(i);
-		uint type = poly->type()>>16;
-
-		if (!(type == HRBFAC || type == I_TRNBSN))
-			continue;
-		const Style::Point &style = s.point(poly->type());
-		const QImage *img = style.img().isNull() ? 0 : &style.img();
-		if (!img)
-			continue;
-
-		TextPointItem *item = new TextPointItem(
-		  ll2xy(centroid(poly->path().first())).toPoint(),
-		  0, 0, img, 0, 0, 0, 0);
-		if (item->isValid() && !item->collides(textItems))
-			textItems.append(item);
-		else
-			delete item;
-	}
-
 	for (int i = 0; i < _points.size(); i++) {
 		const MapData::Point *point = _points.at(i);
 		const Style::Point &style = s.point(point->type());
@@ -249,6 +229,25 @@ void RasterTile::processPoints(QList<TextItem*> &textItems)
 		else
 			delete item;
 	}
+
+	for (int i = 0; i < _polygons.size(); i++) {
+		const MapData::Poly *poly = _polygons.at(i);
+
+		if (poly->type()>>16 == HRBFAC) {
+			const Style::Point &style = s.point(poly->type());
+			const QImage *img = style.img().isNull() ? 0 : &style.img();
+			if (!img)
+				continue;
+
+			TextPointItem *item = new TextPointItem(
+			  ll2xy(centroid(poly->path().first())).toPoint(), 0, 0,
+			  &style.img(), 0, 0, 0, 0);
+			if (item->isValid() && !item->collides(textItems))
+				textItems.append(item);
+			else
+				delete item;
+		}
+	}
 }
 
 void RasterTile::processLines(QList<TextItem*> &textItems)

src/map/ENC/style.cpp

@@ -94,7 +94,7 @@ void Style::defaultPolygonStyle()
 	  Qt::Dense7Pattern));
 	_polygons[TYPE(I_LOKBSN)] = Polygon(QBrush(QColor("#333333"),
 	  Qt::Dense7Pattern));
-	_polygons[TYPE(TUNNEL)] = Polygon(Qt::NoBrush, QPen(QColor("#a58140"), 1.5,
+	_polygons[TYPE(TUNNEL)] = Polygon(Qt::NoBrush, QPen(QColor("#a3a3a3"), 1,
 	  Qt::DashLine));
 	_polygons[TYPE(CBLARE)] = Polygon(QImage(":/marine/cable-area-line.png"));
 	_polygons[TYPE(PIPARE)] = Polygon(QImage(":/marine/pipeline-area-line.png"));
@@ -190,7 +190,6 @@ void Style::defaultPointStyle()
 	_points[SUBTYPE(LNDMRK, 9)] = Point(QImage(":/marine/monument.png"));
 	_points[SUBTYPE(LNDMRK, 20)] = Point(QImage(":/marine/church.png"));
 	_points[SUBTYPE(LNDMRK, 17)] = Point(QImage(":/marine/tower.png"));
-	_points[SUBTYPE(LNDMRK, 19)] = Point(QImage(":/marine/windmotor.png"));
 	_points[TYPE(LNDELV)] = Point(QImage(":/marine/triangulation-point.png"));
 	_points[TYPE(OBSTRN)] = Point(QImage(":/marine/obstruction.png"), Small);
 	_points[SUBTYPE(WRECKS, 1)] = Point(QImage(":/marine/wreck.png"), Small);
@@ -225,10 +224,6 @@ void Style::defaultPointStyle()
 	_points[SUBTYPE(I_DISMAR, 1)] = Point(QImage(":/marine/distance-mark.png"));
 	_points[SUBTYPE(I_DISMAR, 1)].setTextColor(QColor("#ffffff"));
 	_points[SUBTYPE(I_DISMAR, 1)].setTextFontSize(Small);
-	_points[SUBTYPE(I_DISMAR, 2)] = Point(QImage(":/marine/distance-mark-land.png"));
-	_points[SUBTYPE(I_DISMAR, 2)].setTextFontSize(Small);
-	_points[SUBTYPE(I_DISMAR, 3)] = Point(QImage(":/marine/distance-mark-land.png"));
-	_points[SUBTYPE(I_DISMAR, 3)].setTextFontSize(Small);
 	_points[TYPE(CGUSTA)] = Point(QImage(":/marine/coast-guard.png"));
 	_points[TYPE(RDOSTA)] = Point(QImage(":/marine/radio.png"));
 	_points[TYPE(RADSTA)] = Point(QImage(":/marine/radar.png"));