From 1932bc0bfb59bc584a9fa7c41f2e52a659af25d7 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 21 Jun 2025 13:42:05 +0700 Subject: [PATCH] [styles] Remove deprecated landuse=field Signed-off-by: Konstantin Pastbin --- android/app/src/main/res/values/types_strings.xml | 1 - data/mapcss-mapping.csv | 4 ++-- data/styles/default/include/Basemap.mapcss | 3 --- data/styles/default/include/priorities_1_BG-by-size.prio.txt | 1 - data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt | 1 - data/styles/vehicle/include/Basemap.mapcss | 2 -- data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt | 1 - 7 files changed, 2 insertions(+), 11 deletions(-) diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml index 23f5acad3..c2835d861 100644 --- a/android/app/src/main/res/values/types_strings.xml +++ b/android/app/src/main/res/values/types_strings.xml @@ -620,7 +620,6 @@ Educational Facility Farmland Farmyard - Field Flowerbed Forest Coniferous Forest diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 44d364d76..d1f642a5e 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -421,7 +421,7 @@ aeroway|gate;315; # TODO: railway=preserved is deprecated in OSM, recommended mapping is railway:preserved=yes + railway=* railway|preserved;316; highway|path|horse;[highway=path][horse?];;name;int_name;317; -landuse|field;318; +deprecated:landuse|field:06.2025;318;x hwtag|nocycleway;319; leisure|water_park;320; natural|wetland|bog;[natural=wetland][wetland=bog];;name;int_name;321; @@ -1742,4 +1742,4 @@ railway|station|subway|shenzhen;[railway=station][transport=subway][city=shenzhe railway|subway_entrance|shenzhen;[railway=subway_entrance][city=shenzhen];;name;int_name;1621; shop|hearing_aids;1622; railway|station|subway|qingdao;[railway=station][transport=subway][city=qingdao],[railway=station][station=subway][city=qingdao];;name;int_name;1623; -railway|subway_entrance|qingdao;[railway=subway_entrance][city=qingdao];;name;int_name;1624; \ No newline at end of file +railway|subway_entrance|qingdao;[railway=subway_entrance][city=qingdao];;name;int_name;1624; diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss index 62c8a8348..30b2fc74f 100644 --- a/data/styles/default/include/Basemap.mapcss +++ b/data/styles/default/include/Basemap.mapcss @@ -110,7 +110,6 @@ area|z12-[landuse=vineyard], area|z12-[landuse=meadow], area|z12-[landuse=recreation_ground], area|z12-[landuse=village_green], -area|z12-[landuse=field], area|z12-[natural=scrub], area|z14-[leisure=miniature_golf], area|z16-[landuse=flowerbed], @@ -143,7 +142,6 @@ area|z14-[landuse=vineyard], area|z14-15[landuse=meadow], area|z14-[landuse=recreation_ground], area|z14-[landuse=village_green], -area|z14-[landuse=field], {fill-color: @green1;} area|z11[landuse=forest], area|z16-[natural=grassland], @@ -184,7 +182,6 @@ area|z12-13[landuse=vineyard], area|z12-13[landuse=meadow], area|z12-13[landuse=recreation_ground], area|z12-13[landuse=village_green], -area|z12-13[landuse=field], area|z12-13[natural=scrub], {fill-color: @green0;} diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt index 05a8fe629..204547d6a 100644 --- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt @@ -106,7 +106,6 @@ landuse-farmyard # area z10- (also has captio landuse-allotments # area z12- (also has caption z15-) landuse-farmland # area z10- (also has caption z15-) -landuse-field # area z12- landuse-meadow # area z12- landuse-orchard # area z12- (also has caption z15-) landuse-recreation_ground # area z12- (also has caption z15-) diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt index e301146fd..9fc8a2eac 100644 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt @@ -106,7 +106,6 @@ landuse-farmyard # area z10- (also has captio landuse-allotments # area z12- (also has caption z15-) landuse-farmland # area z10- (also has caption z15-) -landuse-field # area z12- landuse-meadow # area z12- landuse-orchard # area z12- (also has caption z15-) landuse-recreation_ground # area z12- (also has caption z15-) diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index 6f89aa2d4..0711d97bc 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -102,7 +102,6 @@ area|z12-[landuse=vineyard], area|z12-[landuse=meadow], area|z12-[landuse=recreation_ground], area|z12-[landuse=village_green], -area|z12-[landuse=field], {fill-opacity: 1;} area|z10[landuse=forest], @@ -118,7 +117,6 @@ area|z12-[landuse=vineyard], area|z12-[landuse=meadow], area|z12-[landuse=recreation_ground], area|z12-[landuse=village_green], -area|z12-[landuse=field], {fill-color: @green1;} area|z11-12[landuse=forest], diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt index 6c81a9aba..e8d77cc8f 100644 --- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt @@ -63,7 +63,6 @@ landuse-farmyard # area z14- landuse-allotments # area z12- landuse-farmland # area z14- -landuse-field # area z12- landuse-meadow # area z12- landuse-orchard # area z12- landuse-recreation_ground # area z12-