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

[classif] Migrate deprecated tourism-resort to leisure-resort

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2024-03-28 00:05:43 +03:00 • committed by Viktor Havaka
parent 2b085b027d
commit 4ad3980dbf
8 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/categories.txt
View file

@ -13769,8 +13769,7 @@ sk:5Apartmány
fa:اپارتمان|سوئیت
mr:सदनिका|फ्लॅट|अपार्टमेंट
# [tourism=resort] is deprecated
tourism-resort|@category_hotel
leisure-resort|@category_hotel
en:Resort
ru:Дом отдыха
bg:Курорт

3
data/editor.config
View file

@ -579,6 +579,9 @@
<type id="leisure-garden" can_add="no">
<include group="poi_internet" />
</type>
<type id="leisure-resort">
<include group="poi_internet" />
</type>
<type id="leisure-sports_centre">
<include group="poi_internet" />
</type>

2
data/mapcss-mapping.csv
View file

@ -1197,7 +1197,7 @@ leisure|sports_centre|swimming;[leisure=sports_centre][sport=swimming];x;name;in
leisure|sports_centre|yoga;[leisure=sports_centre][sport=yoga];x;name;int_name;1108;leisure|sports_centre
amenity|public_bookcase;1109;
tourism|apartment;1110;
tourism|resort;[tourism=resort],[leisure=resort],[leisure=summer_camp];;name;int_name;1111;
leisure|resort;[leisure=resort],[tourism=resort],[leisure=summer_camp];;name;int_name;1111;
shop|interior_decoration;1112;
shop|houseware;1113;
hwtag|nobicycle;1114;

Can't render this file because it contains an unexpected character in line 7 and column 16.

2
data/strings/types_strings.txt
View file

@ -30498,7 +30498,7 @@
zh-Hans = 野餐地点
zh-Hant = 野餐
[type.tourism.resort]
[type.leisure.resort]
en = Resort
af = Oord
ar = منتجع

12
data/styles/clear/include/Icons.mapcss
View file

@ -714,8 +714,8 @@ area|z16-[tourism=guest_house],
node|z13-[tourism=alpine_hut],
node|z16-[tourism=wilderness_hut],
node|z16-[tourism=chalet],
node|z16-[tourism=resort],
area|z16-[tourism=resort],
node|z16-[leisure=resort],
area|z16-[leisure=resort],
node|z16-[tourism=motel],
area|z16-[tourism=motel],
node|z16-[tourism=apartment],
@ -730,8 +730,8 @@ node|z16-[tourism=caravan_site],
node|z16[tourism=hotel],
node|z16[tourism=resort],
area|z16[tourism=resort],
node|z16[leisure=resort],
area|z16[leisure=resort],
node|z16[tourism=motel],
area|z16[tourism=motel]
{icon-image: hotel-m.svg;icon-min-distance: 24;}
@ -752,8 +752,8 @@ node|z16[tourism=chalet],
node|z17-[tourism=hotel],
node|z17-[tourism=motel],
area|z17-[tourism=motel],
node|z17-[tourism=resort],
area|z17-[tourism=resort]
node|z17-[leisure=resort],
area|z17-[leisure=resort]
{icon-image: hotel-m.svg;icon-min-distance: 16;}
node|z17-[tourism=hostel]
{icon-image: hostel-m.svg;icon-min-distance: 16;}

2
data/styles/clear/include/priorities_4_overlays.prio.txt
View file

@ -747,7 +747,7 @@ piste:type-snow_park # caption z15- (also has are
amenity-townhall # icon z16- (also has caption(optional) z16-)
tourism-hotel # icon z16- (also has caption(optional) z16-)
tourism-resort # icon z16- (also has caption(optional) z16-)
leisure-resort # icon z16- (also has caption(optional) z16-)
=== 2750
amenity-arts_centre # icon z17- (also has caption(optional) z17-)

2
data/styles/outdoors/include/priorities_4_overlays.prio.txt
View file

@ -747,7 +747,7 @@ piste:type-snow_park # caption z15- (also has are
amenity-townhall # icon z16- (also has caption(optional) z16-)
tourism-hotel # icon z16- (also has caption(optional) z16-)
tourism-resort # icon z16- (also has caption(optional) z16-)
leisure-resort # icon z16- (also has caption(optional) z16-)
=== 2750
amenity-arts_centre # icon z17- (also has caption(optional) z17-)

2
generator/generator_tests/osm_type_test.cpp
View file

@ -2491,6 +2491,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
{"leisure", "pitch"},
{"leisure", "playground"},
{"leisure", "recreation_ground"},
{"leisure", "resort"},
{"leisure", "sauna"},
{"leisure", "slipway"},
{"leisure", "sports_centre"},
@ -2700,7 +2701,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
{"tourism", "motel"},
{"tourism", "museum"},
{"tourism", "picnic_site"},
{"tourism", "resort"},
{"tourism", "theme_park"},
{"tourism", "viewpoint"},
{"tourism", "wilderness_hut"},