diff --git a/src/map/IMG/style.cpp b/src/map/IMG/style.cpp index 8a82fe64..c044af94 100644 --- a/src/map/IMG/style.cpp +++ b/src/map/IMG/style.cpp @@ -148,8 +148,14 @@ void Style::defaultLineStyle() _lines[TYPE(0x29)].setTextFontSize(Style::None); } -void Style::defaultPOIStyle() +void Style::defaultPointStyle() { + // Cities + _points[TYPE(0x01)].setTextFontSize(Style::Large); + _points[TYPE(0x02)].setTextFontSize(Style::Large); + _points[TYPE(0x03)].setTextFontSize(Style::Large); + + // POI _points[0x2a00] = Point(QImage(":/restaurant-11.png")); _points[0x2a01] = Point(QImage(":/restaurant-11.png")); _points[0x2a02] = Point(QImage(":/restaurant-noodle-11.png")); @@ -934,7 +940,7 @@ Style::Style(SubFile *typ) { defaultLineStyle(); defaultPolygonStyle(); - defaultPOIStyle(); + defaultPointStyle(); if (typ && typ->isValid()) parseTYPFile(typ); diff --git a/src/map/IMG/style.h b/src/map/IMG/style.h index ea058fd6..81eeb0b8 100644 --- a/src/map/IMG/style.h +++ b/src/map/IMG/style.h @@ -138,7 +138,7 @@ private: const Section §ion, ItemInfo &info); void defaultPolygonStyle(); void defaultLineStyle(); - void defaultPOIStyle(); + void defaultPointStyle(); QMap _lines; QMap _polygons; diff --git a/src/map/imgmap.cpp b/src/map/imgmap.cpp index 96e9ae81..886bed10 100644 --- a/src/map/imgmap.cpp +++ b/src/map/imgmap.cpp @@ -118,10 +118,10 @@ static const QFont *name() \ return &f; \ } -FONT(largeFont, 14) -FONT(normalFont, 12) -FONT(smallFont, 10) -FONT(poiFont, 9) +FONT(largeFont, 16) +FONT(normalFont, 14) +FONT(smallFont, 12) +FONT(poiFont, 10) static const QColor *shieldBgColor(Label::Shield::Type type) { @@ -352,11 +352,11 @@ void IMGMap::processLines(QList &lines, const QPoint &tile, case Style::Large: font = largeFont(); break; - case Style::Small: - font = smallFont(); + case Style::Normal: + font = normalFont(); break; default: - font = normalFont(); + font = smallFont(); } const QColor *color = style.textColor().isValid() ? &style.textColor() : 0; @@ -388,7 +388,7 @@ void IMGMap::processLines(QList &lines, const QPoint &tile, int idx = poly.points.size()/2, inc = 0, sign = 1; TextPointItem *item = new TextPointItem( - poly.points.at(idx).toPoint(), &shield.text(), smallFont(), + poly.points.at(idx).toPoint(), &shield.text(), poiFont(), 0, &shieldColor, shieldBgColor(shield.type())); while (1) { @@ -444,14 +444,14 @@ void IMGMap::processPoints(QList &points, case Style::None: label = 0; break; - case Style::Normal: - font = normalFont(); - break; case Style::Small: font = smallFont(); break; - default: + case Style::Large: font = largeFont(); + break; + default: + font = normalFont(); } } const QColor *color = style.textColor().isValid()