mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[classifier] Replaced deprecated piste:list with aerialway.

Browse source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2022-10-11 10:18:59 +03:00
parent b5dd022027
commit e07b195791
8 changed files with 24 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/mapcss-mapping.csv
View file

@ -438,7 +438,7 @@ deprecated|deprecated;437;x
deprecated|deprecated;438;x
deprecated|deprecated;439;x
deprecated|deprecated;440;x
piste:lift|t-bar;441;
aerialway|t-bar;441;
deprecated|deprecated;442;x
deprecated|deprecated;443;x
highway|path|difficult_alpine_hiking;[highway=path][sac_scale=difficult_alpine_hiking];;name;int_name;444;
@ -474,7 +474,7 @@ deprecated|deprecated;473;x
natural|grassland;474;
deprecated|deprecated;475;x
deprecated|deprecated;476;x
piste:lift|platter;477;
aerialway|platter;477;
deprecated|deprecated;478;x
deprecated|deprecated;479;x
railway|preserved|tunnel;[railway=preserved][tunnel?];;name;int_name;480;
@ -572,7 +572,7 @@ deprecated|deprecated;571;x
deprecated|deprecated;572;x
deprecated|deprecated;573;x
deprecated|deprecated;574;x
piste:lift|rope_tow;575;
aerialway|rope_tow;575;
natural|pond;576;natural|water|pond
deprecated|deprecated;577;x
highway|secondary_link|tunnel;[highway=secondary_link][tunnel?];;name;int_name;578;
@ -605,7 +605,7 @@ boundary|administrative|nation;[boundary=administrative][border_type=nation];;na
deprecated|deprecated;605;x
deprecated|deprecated;606;x
deprecated|deprecated;607;x
piste:lift|magic_carpet;608;
aerialway|magic_carpet;608;
deprecated|deprecated;609;x
deprecated|deprecated;610;x
deprecated|deprecated;611;x
@ -616,7 +616,7 @@ deprecated|deprecated;615;x
deprecated|deprecated;616;x
deprecated|deprecated;617;x
deprecated|deprecated;618;x
piste:lift|j-bar;619;
aerialway|j-bar;619;
deprecated|deprecated;620;x
deprecated|deprecated;621;x
deprecated|deprecated;622;x

Can't render this file because it has a wrong number of fields in line 11.

6
data/replaced_tags.txt
View file

@ -137,3 +137,9 @@ recycling:paper_packaging=yes : recycling:paper=yes
recycling:newspaper=yes : recycling:paper=yes
recycling:magazines=yes : recycling:paper=yes
recycling:beverage_cartons=yes : recycling:cartons=yes
piste:lift=platter : aerialway=platter
piste:lift=t-bar : aerialway=t-bar
piste:lift=j-bar : aerialway=j-bar
piste:lift=rope_tow : aerialway=rope_tow
piste:lift=magic_carpet : aerialway=magic_carpet

22
data/strings/types_strings.txt
View file

@ -23787,19 +23787,7 @@
zh-Hans = 配备残疾人专用
zh-Hant = 配備殘疾人專用
[type.piste_lift]
comment = en.wikipedia.org/wiki/Surface_lift
en = Surface Lift
de = Lift
fr = Téléski
nl = Sleeplift
pt = Telesqui
pt-BR = Telesqui
ru = Бугельный подъёмник
tr = Kayak Teleferiği
uk = Бугельний витяг
[type.piste_lift.j.bar]
[type.aerialway.j.bar]
en = J-bar Lift
de = Schlepplift
fr = Téléski
@ -23810,7 +23798,7 @@
tr = Kayak Teleferiği
uk = Бугельний витяг
[type.piste_lift.magic_carpet]
[type.aerialway.magic_carpet]
en = Magic Carpet
de = Laufband
fr = Tapis roulant
@ -23821,7 +23809,7 @@
tr = Kayak Teleferiği
uk = Стрiчковий конвеєр
[type.piste_lift.platter]
[type.aerialway.platter]
en = Platter Lift
de = Tellerlift
nl = Sleeplift
@ -23831,7 +23819,7 @@
tr = Tabak Asansörü
uk = Бугельний витяг
[type.piste_lift.rope_tow]
[type.aerialway.rope_tow]
en = Rope Tow
de = Seillift
nl = Touwlift
@ -23841,7 +23829,7 @@
tr = Çekme Halatı
uk = Бугельний витяг
[type.piste_lift.t.bar]
[type.aerialway.t.bar]
en = T-bar Lift
de = T-Bügel-Lift
nl = Sleeplift (T-beugel)

37
data/styles/clear/include/Roads.mapcss
View file

@ -264,14 +264,6 @@ line[aerialway=rope_tow],
line[power=line]
{z-index: 2000;}
line[piste:lift],
line[piste:lift=j-bar],
line[piste:lift=magic_carpet],
line[piste:lift=platter],
line[piste:lift=rope_tow],
line[piste:lift=t-bar]
{z-index: 6888;}
line[highway]
{casing-width: 0;}
@ -1218,12 +1210,6 @@ line|z15-[railway=funicular],
/* 10.PISTE 12-22 ZOOM */
line|z12-[piste:lift],
line|z12-[piste:lift=j-bar],
line|z12-[piste:lift=magic_carpet],
line|z12-[piste:lift=platter],
line|z12-[piste:lift=rope_tow],
line|z12-[piste:lift=t-bar],
line|z12-[aerialway=cable_car],
line|z12-[aerialway=chair_lift],
line|z12-[aerialway=gondola],
@ -1246,29 +1232,6 @@ line|z12-[aerialway=platter]::dash,
line|z12-[aerialway=rope_tow]::dash,
{color: @aerialway;opacity: 1;}
/* 10.1 Lift 12-22 ZOOM */
line|z12-14[piste:lift=j-bar],
line|z12-14[piste:lift=magic_carpet],
line|z12-14[piste:lift=platter],
line|z12-14[piste:lift=rope_tow],
line|z12-14[piste:lift=t-bar],
{width: 1;}
line|z15-[piste:lift],
line|z15-[piste:lift=j-bar],
line|z15-[piste:lift=magic_carpet],
line|z15-[piste:lift=platter],
line|z15-[piste:lift=rope_tow],
line|z15-[piste:lift=t-bar]
{width: 1.6;}
line|z17-[piste:lift],
line|z17-[piste:lift=j-bar],
line|z17-[piste:lift=magic_carpet],
line|z17-[piste:lift=platter],
line|z17-[piste:lift=rope_tow],
line|z17-[piste:lift=t-bar]
{width: 2;}
/* 10.2 Aerialway 12-22 ZOOM */
line|z12-15[aerialway=cable_car],

14
data/styles/clear/include/Roads_label.mapcss
View file

@ -163,14 +163,6 @@ line[aerialway=rope_tow],
line[power=line]
{z-index: 2000;}
line[piste:lift],
line[piste:lift=j-bar],
line[piste:lift=magic_carpet],
line[piste:lift=platter],
line[piste:lift=rope_tow],
line[piste:lift=t-bar],
{z-index: 6888;}
/* 2.SHIELD 10-22 ZOOM */
line|z10-[highway=motorway],
@ -482,12 +474,6 @@ line[railway=funicular]
*/
/* 10.PISTE 15-22 ZOOM */
/*
line[piste:lift],
line[piste:lift=j-bar],
line[piste:lift=magic_carpet],
line[piste:lift=platter],
line[piste:lift=rope_tow],
line[piste:lift=t-bar],
line[power=line],
line[aerialway=cable_car],
line[aerialway=chair_lift],

42
data/styles/vehicle/include/Roads.mapcss
View file

@ -264,14 +264,6 @@ line[aerialway=rope_tow],
line[power=line]
{z-index: 2000;}
line[piste:lift],
line[piste:lift=j-bar],
line[piste:lift=magic_carpet],
line[piste:lift=platter],
line[piste:lift=rope_tow],
line[piste:lift=t-bar]
{z-index: 6888;}
line[highway]
{casing-width: 0;}
@ -1222,12 +1214,7 @@ line|z15-[railway=funicular],
/* 10.PISTE 12-22 ZOOM */
/*line|z12-[piste:lift],
line|z12-[piste:lift=j-bar],
line|z12-[piste:lift=magic_carpet],
line|z12-[piste:lift=platter],
line|z12-[piste:lift=rope_tow],
line|z12-[piste:lift=t-bar],
/*
line|z12-[aerialway=cable_car],
line|z12-[aerialway=chair_lift],
line|z12-[aerialway=gondola],
@ -1249,31 +1236,8 @@ line|z12-[aerialway=magic_carpet]::dash,
line|z12-[aerialway=platter]::dash,
line|z12-[aerialway=rope_tow]::dash,
line|z18-[power=line],
{color: @aerialway;opacity: 1;}*/
/* 10.1 Lift 12-22 ZOOM */
/*line|z12-14[piste:lift=j-bar],
line|z12-14[piste:lift=magic_carpet],
line|z12-14[piste:lift=platter],
line|z12-14[piste:lift=rope_tow],
line|z12-14[piste:lift=t-bar],
line|z19-[power=line],
{width: 1;}
line|z15-[piste:lift],
line|z15-[piste:lift=j-bar],
line|z15-[piste:lift=magic_carpet],
line|z15-[piste:lift=platter],
line|z15-[piste:lift=rope_tow],
line|z15-[piste:lift=t-bar]
{width: 1.6;}
line|z17-[piste:lift],
line|z17-[piste:lift=j-bar],
line|z17-[piste:lift=magic_carpet],
line|z17-[piste:lift=platter],
line|z17-[piste:lift=rope_tow],
line|z17-[piste:lift=t-bar]
{width: 2;}*/
{color: @aerialway;opacity: 1;}
*/
/* 10.2 Aerialway 12-22 ZOOM */

14
data/styles/vehicle/include/Roads_label.mapcss
View file

@ -163,14 +163,6 @@ line[aerialway=rope_tow],
line[power=line]
{z-index: 2000;}
line[piste:lift],
line[piste:lift=j-bar],
line[piste:lift=magic_carpet],
line[piste:lift=platter],
line[piste:lift=rope_tow],
line[piste:lift=t-bar],
{z-index: 6888;}
/* 2.SHIELD 10-22 ZOOM */
line|z10-[highway=motorway],
@ -514,12 +506,6 @@ line[railway=funicular]
*/
/* 10.PISTE 15-22 ZOOM */
/*
line[piste:lift],
line[piste:lift=j-bar],
line[piste:lift=magic_carpet],
line[piste:lift=platter],
line[piste:lift=rope_tow],
line[piste:lift=t-bar],
line[power=line],
line[aerialway=cable_car],
line[aerialway=chair_lift],

10
generator/generator_tests/osm_type_test.cpp
View file

@ -1960,11 +1960,11 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
{"office", "telecommunication"},
{"organic", "only"},
{"organic", "yes"},
{"piste:lift", "j-bar"},
{"piste:lift", "magic_carpet"},
{"piste:lift", "platter"},
{"piste:lift", "rope_tow"},
{"piste:lift", "t-bar"},
{"aerialway", "j-bar"},
{"aerialway", "magic_carpet"},
{"aerialway", "platter"},
{"aerialway", "rope_tow"},
{"aerialway", "t-bar"},
{"piste:type", "downhill"},
{"piste:type", "nordic"},
{"piste:type", "sled"},