Skip to content

Commit afe9252

Browse files
dg0ytdg0yt
committed
symbol sets: Fix ISOM2000 spelling (no hyphen)
1 parent da042fe commit afe9252

14 files changed

+17
-17
lines changed

‎symbol sets/10000/ISOM-2000_10000.omap ‎symbol sets/10000/ISOM2000_10000.omap

File renamed without changes.

‎symbol sets/10000/ISOM-2000_cs_10000.omap ‎symbol sets/10000/ISOM2000_cs_10000.omap

File renamed without changes.

‎symbol sets/10000/ISOM-2000_fi_10000.omap ‎symbol sets/10000/ISOM2000_fi_10000.omap

File renamed without changes.

‎symbol sets/10000/ISOM-2000_ru_10000.omap ‎symbol sets/10000/ISOM2000_ru_10000.omap

File renamed without changes.

‎symbol sets/15000/ISOM-2000_15000.omap ‎symbol sets/15000/ISOM2000_15000.omap

File renamed without changes.

‎symbol sets/15000/ISOM-2000_cs_15000.omap ‎symbol sets/15000/ISOM2000_cs_15000.omap

File renamed without changes.

‎symbol sets/15000/ISOM-2000_fi_15000.omap ‎symbol sets/15000/ISOM2000_fi_15000.omap

File renamed without changes.

‎symbol sets/15000/ISOM-2000_ru_15000.omap ‎symbol sets/15000/ISOM2000_ru_15000.omap

File renamed without changes.

‎symbol sets/CMakeLists.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,24 @@ endif()
2626
set(Mapper_SYMBOL_SETS
2727
4000/ISSOM_4000.omap
2828
5000/ISSOM_5000.omap
29-
10000/ISOM-2000_10000.omap
30-
15000/ISOM-2000_15000.omap
29+
10000/ISOM2000_10000.omap
30+
15000/ISOM2000_15000.omap
3131

3232
4000/ISSOM_cs_4000.omap
3333
5000/ISSOM_cs_5000.omap
34-
10000/ISOM-2000_cs_10000.omap
35-
15000/ISOM-2000_cs_15000.omap
34+
10000/ISOM2000_cs_10000.omap
35+
15000/ISOM2000_cs_15000.omap
3636

3737
4000/ISSOM_fi_4000.omap
3838
5000/ISSOM_fi_5000.omap
39-
10000/ISOM-2000_fi_10000.omap
40-
15000/ISOM-2000_fi_15000.omap
39+
10000/ISOM2000_fi_10000.omap
40+
15000/ISOM2000_fi_15000.omap
4141

4242
4000/ISSOM_fr_4000.omap
4343
5000/ISSOM_fr_5000.omap
4444

45-
10000/ISOM-2000_ru_10000.omap
46-
15000/ISOM-2000_ru_15000.omap
45+
10000/ISOM2000_ru_10000.omap
46+
15000/ISOM2000_ru_15000.omap
4747

4848
5000/ISMTBOM_5000.omap
4949
7500/ISMTBOM_7500.omap

‎symbol sets/src/ISOM-2000_15000.xmap ‎symbol sets/src/ISOM2000_15000.xmap

File renamed without changes.

‎symbol sets/src/ISOM-2000_cs_15000.xmap ‎symbol sets/src/ISOM2000_cs_15000.xmap

File renamed without changes.

‎symbol sets/src/ISOM-2000_fi_15000.xmap ‎symbol sets/src/ISOM2000_fi_15000.xmap

File renamed without changes.

‎symbol sets/src/ISOM-2000_ru_15000.xmap ‎symbol sets/src/ISOM2000_ru_15000.xmap

File renamed without changes.

‎test/symbol_set_t.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -96,26 +96,26 @@ void SymbolSetTool::processSymbolSet_data()
9696
QTest::addColumn<unsigned int>("source_scale");
9797
QTest::addColumn<unsigned int>("target_scale");
9898

99-
QTest::newRow("ISOM-2000 1:15000") << QString::fromLatin1("ISOM-2000") << 15000u << 15000u;
100-
QTest::newRow("ISOM-2000 1:10000") << QString::fromLatin1("ISOM-2000") << 15000u << 10000u;
99+
QTest::newRow("ISOM2000 1:15000") << QString::fromLatin1("ISOM2000") << 15000u << 15000u;
100+
QTest::newRow("ISOM2000 1:10000") << QString::fromLatin1("ISOM2000") << 15000u << 10000u;
101101
QTest::newRow("ISSOM 1:5000") << QString::fromLatin1("ISSOM") << 5000u << 5000u;
102102
QTest::newRow("ISSOM 1:4000") << QString::fromLatin1("ISSOM") << 5000u << 4000u;
103103

104-
QTest::newRow("ISOM-2000 1:15000 Czech") << QString::fromLatin1("ISOM-2000_cs") << 15000u << 15000u;
105-
QTest::newRow("ISOM-2000 1:10000 Czech") << QString::fromLatin1("ISOM-2000_cs") << 15000u << 10000u;
104+
QTest::newRow("ISOM2000 1:15000 Czech") << QString::fromLatin1("ISOM2000_cs") << 15000u << 15000u;
105+
QTest::newRow("ISOM2000 1:10000 Czech") << QString::fromLatin1("ISOM2000_cs") << 15000u << 10000u;
106106
QTest::newRow("ISSOM 1:5000 Czech") << QString::fromLatin1("ISSOM_cs") << 5000u << 5000u;
107107
QTest::newRow("ISSOM 1:4000 Czech") << QString::fromLatin1("ISSOM_cs") << 5000u << 4000u;
108108

109-
QTest::newRow("ISOM-2000 1:15000 Finnish") << QString::fromLatin1("ISOM-2000_fi") << 15000u << 15000u;
110-
QTest::newRow("ISOM-2000 1:10000 Finnish") << QString::fromLatin1("ISOM-2000_fi") << 15000u << 10000u;
109+
QTest::newRow("ISOM2000 1:15000 Finnish") << QString::fromLatin1("ISOM2000_fi") << 15000u << 15000u;
110+
QTest::newRow("ISOM2000 1:10000 Finnish") << QString::fromLatin1("ISOM2000_fi") << 15000u << 10000u;
111111
QTest::newRow("ISSOM 1:5000 Finnish") << QString::fromLatin1("ISSOM_fi") << 5000u << 5000u;
112112
QTest::newRow("ISSOM 1:4000 Finnish") << QString::fromLatin1("ISSOM_fi") << 5000u << 4000u;
113113

114114
QTest::newRow("ISSOM 1:5000 French") << QString::fromLatin1("ISSOM_fr") << 5000u << 5000u;
115115
QTest::newRow("ISSOM 1:4000 French") << QString::fromLatin1("ISSOM_fr") << 5000u << 4000u;
116116

117-
QTest::newRow("ISOM-2000 1:15000 Russian") << QString::fromLatin1("ISOM-2000_ru") << 15000u << 15000u;
118-
QTest::newRow("ISOM-2000 1:10000 Russian") << QString::fromLatin1("ISOM-2000_ru") << 15000u << 10000u;
117+
QTest::newRow("ISOM2000 1:15000 Russian") << QString::fromLatin1("ISOM2000_ru") << 15000u << 15000u;
118+
QTest::newRow("ISOM2000 1:10000 Russian") << QString::fromLatin1("ISOM2000_ru") << 15000u << 10000u;
119119

120120
QTest::newRow("ISMTBOM 1:20000") << QString::fromLatin1("ISMTBOM") << 15000u << 20000u;
121121
QTest::newRow("ISMTBOM 1:15000") << QString::fromLatin1("ISMTBOM") << 15000u << 15000u;
@@ -190,7 +190,7 @@ void SymbolSetTool::processSymbolSet()
190190
{
191191
map.setScaleDenominator(target_scale);
192192

193-
if (name.startsWith(QLatin1String("ISOM-2000")))
193+
if (name.startsWith(QLatin1String("ISOM2000")))
194194
{
195195
const double factor = double(source_scale) / double(target_scale);
196196
map.scaleAllObjects(factor, MapCoord());

0 commit comments

Comments
 (0)