gpxsee.pro

@@ -134,6 +134,7 @@ HEADERS += src/common/config.h \
     src/map/encjob.h \
     src/map/encmap.h \
     src/map/ENC/iso8211.h \
+    src/map/encstyle.h \
     src/map/gemfmap.h \
     src/map/gmifile.h \
     src/map/oruxmap.h \
@@ -349,6 +350,7 @@ SOURCES += src/main.cpp \
     src/map/encatlas.cpp \
     src/map/encmap.cpp \
     src/map/ENC/iso8211.cpp \
+    src/map/encstyle.cpp \
     src/map/gemfmap.cpp \
     src/map/gmifile.cpp \
     src/map/oruxmap.cpp \

src/map/ENC/rastertile.cpp

@@ -17,12 +17,6 @@ typedef QSet<Coordinates> PointSet;
 static const float C1 = 0.866025f; /* sqrt(3)/2 */
 static const QColor haloColor(Qt::white);
 
-static const Style *style()
-{
-	static ENC::Style s;
-	return &s;
-}
-
 static double area(const QVector<Coordinates> &polygon)
 {
 	double area = 0;
@@ -403,23 +397,3 @@ void RasterTile::render()
 
 	_valid = true;
 }
-
-RasterTile::RasterTile(const Projection &proj, const Transform &transform,
-  const MapData *data, int zoom, const Range &zoomRange, const QRect &rect,
-  qreal ratio) :
-	_proj(proj), _transform(transform), _map(data), _atlas(0), _zoom(zoom),
-	_zoomRange(zoomRange), _rect(rect), _ratio(ratio),
-	_pixmap(rect.width() * ratio, rect.height() * ratio), _valid(false)
-{
-	_style = style();
-}
-
-RasterTile::RasterTile(const Projection &proj, const Transform &transform,
-  AtlasData *data, int zoom, const Range &zoomRange, const QRect &rect,
-  qreal ratio) :
-	_proj(proj), _transform(transform), _map(0), _atlas(data), _zoom(zoom),
-	_zoomRange(zoomRange), _rect(rect), _ratio(ratio),
-	_pixmap(rect.width() * ratio, rect.height() * ratio), _valid(false)
-{
-	_style = style();
-}

src/map/ENC/rastertile.h

@@ -18,11 +18,17 @@ class RasterTile
 {
 public:
 	RasterTile(const Projection &proj, const Transform &transform,
-	  const MapData *data, int zoom, const Range &zoomRange, const QRect &rect,
-	  qreal ratio);
+	  const Style *style, const MapData *data, int zoom, const Range &zoomRange,
+	  const QRect &rect, qreal ratio) : _proj(proj), _transform(transform),
+	  _style(style), _map(data), _atlas(0), _zoom(zoom), _zoomRange(zoomRange),
+	  _rect(rect), _ratio(ratio), _pixmap(rect.width() * ratio, rect.height()
+	  * ratio), _valid(false) {}
 	RasterTile(const Projection &proj, const Transform &transform,
-	  AtlasData *data, int zoom, const Range &zoomRange, const QRect &rect,
-	  qreal ratio);
+	  const Style *style, AtlasData *data, int zoom, const Range &zoomRange,
+	  const QRect &rect, qreal ratio) : _proj(proj), _transform(transform),
+	  _style(style), _map(0), _atlas(data), _zoom(zoom), _zoomRange(zoomRange),
+	  _rect(rect), _ratio(ratio), _pixmap(rect.width() * ratio, rect.height()
+	  * ratio), _valid(false) {}
 
 	int zoom() const {return _zoom;}
 	QPoint xy() const {return _rect.topLeft();}

src/map/IMG/lblfile.h

@@ -16,14 +16,14 @@ class LBLFile : public SubFile
 {
 public:
 	LBLFile(const IMGData *img)
-	  : SubFile(img), _huffmanText(0), _table(0), _rasters(0), _imgIdSize(0),
-	  _poiShift(0), _shift(0), _encoding(0) {}
+	  : SubFile(img), _huffmanText(0), _table(0), _rasters(0), _codec(1252),
+	  _imgIdSize(0), _poiShift(0), _shift(0), _encoding(0) {}
 	LBLFile(const QString *path)
-	  : SubFile(path), _huffmanText(0), _table(0), _rasters(0), _imgIdSize(0),
-	  _poiShift(0), _shift(0), _encoding(0) {}
+	  : SubFile(path), _huffmanText(0), _table(0), _rasters(0), _codec(1252),
+	  _imgIdSize(0), _poiShift(0), _shift(0), _encoding(0) {}
 	LBLFile(const SubFile *gmp, quint32 offset)
 	  : SubFile(gmp, offset), _huffmanText(0), _table(0), _rasters(0),
-	  _imgIdSize(0), _poiShift(0), _shift(0), _encoding(0) {}
+	  _codec(1252), _imgIdSize(0), _poiShift(0), _shift(0), _encoding(0) {}
 	~LBLFile();
 
 	bool load(Handle &hdl, const RGNFile *rgn, Handle &rgnHdl);

src/map/IMG/style.cpp

@@ -1272,8 +1272,6 @@ const Style::Point &Style::point(quint32 type) const
 
 const QFont *Style::font(Style::FontSize size, Style::FontSize defaultSize) const
 {
-	Q_ASSERT(defaultSize != Style::NotSet);
-
 	switch (size) {
 		case Style::None:
 			return 0;

src/map/encatlas.cpp

@@ -5,6 +5,7 @@
 #include "rectd.h"
 #include "pcs.h"
 #include "encjob.h"
+#include "encstyle.h"
 #include "encatlas.h"
 
 using namespace ENC;
@@ -357,7 +358,7 @@ void ENCAtlas::draw(QPainter *painter, const QRectF &rect, Flags flags)
 				painter->drawPixmap(ttl, pm);
 			else
 				tiles.append(RasterTile(_projection, _transform,
-				  _data.value(_usage), _zoom, zooms(_usage),
+				  ENCStyle::style(), _data.value(_usage), _zoom, zooms(_usage),
 				  QRect(ttl, QSize(TILE_SIZE, TILE_SIZE)), _tileRatio));
 		}
 	}

src/map/encmap.cpp

@@ -5,6 +5,7 @@
 #include "rectd.h"
 #include "pcs.h"
 #include "encjob.h"
+#include "encstyle.h"
 #include "encmap.h"
 
 
@@ -323,8 +324,9 @@ void ENCMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 			if (QPixmapCache::find(key(_zoom, ttl), &pm))
 				painter->drawPixmap(ttl, pm);
 			else
-				tiles.append(RasterTile(_projection, _transform, _data, _zoom,
-				  _zooms, QRect(ttl, QSize(TILE_SIZE, TILE_SIZE)), _tileRatio));
+				tiles.append(RasterTile(_projection, _transform,
+				  ENCStyle::style(), _data, _zoom, _zooms,
+				  QRect(ttl, QSize(TILE_SIZE, TILE_SIZE)), _tileRatio));
 		}
 	}
 

src/map/encstyle.cpp

@@ -0,0 +1,7 @@
+#include "encstyle.h"
+
+const ENC::Style *ENCStyle::style()
+{
+	static ENC::Style s;
+	return &s;
+}

src/map/encstyle.h

@@ -0,0 +1,12 @@
+#ifndef ENCSTYLE_H
+#define ENCSTYLE_H
+
+#include "ENC/style.h"
+
+class ENCStyle
+{
+public:
+	static const ENC::Style *style();
+};
+
+#endif // ENCSTYLE_H