From 70cbdbcba96652fa0e2f464e3afbbb27e01dbea4 Mon Sep 17 00:00:00 2001 From: vng Date: Tue, 27 Jul 2021 10:45:13 +0300 Subject: [PATCH] [osm types] Added leisure=picnic_table. Signed-off-by: vng --- data/categories.txt | 2 +- data/classificator.txt | 1 + data/drules_proto.bin | Bin 215323 -> 215524 bytes data/drules_proto.txt | 67 ++++++++++++++++++++++++++++++++++++ data/drules_proto_clear.bin | Bin 216065 -> 216266 bytes data/drules_proto_clear.txt | 67 ++++++++++++++++++++++++++++++++++++ data/drules_proto_dark.bin | Bin 214837 -> 215038 bytes data/drules_proto_dark.txt | 67 ++++++++++++++++++++++++++++++++++++ data/editor.config | 1 + data/mapcss-mapping.csv | 2 +- data/types.txt | 2 +- data/visibility.txt | 1 + 12 files changed, 207 insertions(+), 3 deletions(-) diff --git a/data/categories.txt b/data/categories.txt index 65872c4642..aba9208066 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -2293,7 +2293,7 @@ sk:4Infocentrum|4turistické informácie sw:Taarifa ya utalii|taarifa fa:اطلاعات گردشگری -tourism-picnic_site|amenity-bbq +tourism-picnic_site|amenity-bbq|leisure-picnic_table en:3Picnic Site ru:Место для пикника|3Пикник bg:пикник|тревна площ diff --git a/data/classificator.txt b/data/classificator.txt index b171242dde..70801a52f6 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -536,6 +536,7 @@ world + permissive - private - {} + picnic_table - pitch - playground - recreation_ground - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 3cefe47a45461fb1eeca5c0b20b1a73f6cfff7ed..dca258e08c0ceb720afc477ff2f16106f28814db 100644 GIT binary patch delta 146 zcmbO|iTBB5-i9rVdW&_AF>;CIq-GYE7NzPIWG3fjCdZc~Cgr3GX>kZBiE;5Ei%q}y fh)Ggdi$f5Xgb*$XVQdl-?YfH@x9cuudbbn+DTOiZ delta 21 dcmaDdnRoUi-i9rVdW+k?FJ|2SeKFJ9r2uer3d{fi diff --git a/data/drules_proto.txt b/data/drules_proto.txt index b8641edf3d..57e5c575d2 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -35686,6 +35686,73 @@ cont { apply_if: "!name" } } +cont { + name: "leisure-picnic_table" + element { + scale: 16 + symbol { + name: "picnic_table-m" + priority: 16485 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15485 + } + } + element { + scale: 17 + symbol { + name: "picnic_table-m" + priority: 16485 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15485 + } + } + element { + scale: 18 + symbol { + name: "picnic_table-m" + priority: 16485 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15485 + } + } + element { + scale: 19 + symbol { + name: "picnic_table-m" + priority: 16485 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15485 + } + } +} cont { name: "leisure-pitch" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index cae08f37e4de719b61370f778604a057458106d2..c2ebaeb5e6e3b3690acfa90e4fa57f46d1cfe3b6 100644 GIT binary patch delta 146 zcmZpi!Fy^ZZ^IVGOAB<4F>;CIq-GYE7NzPIWG3fjCdZc~Cgr3GX>kZBiE;5Ei%n#lecjOZ^IVGOAFd(FJ#<4dm)qlY5;Ck3DE!m diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index cdc4ed965c..192940a7d5 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -35470,6 +35470,73 @@ cont { apply_if: "!name" } } +cont { + name: "leisure-picnic_table" + element { + scale: 16 + symbol { + name: "picnic_table-m" + priority: 16485 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15485 + } + } + element { + scale: 17 + symbol { + name: "picnic_table-m" + priority: 16485 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15485 + } + } + element { + scale: 18 + symbol { + name: "picnic_table-m" + priority: 16485 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15485 + } + } + element { + scale: 19 + symbol { + name: "picnic_table-m" + priority: 16485 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15485 + } + } +} cont { name: "leisure-pitch" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 0ed896fb883e2ae549936503ca19c490967149c0..3ab37d4e9a5d4295e6c146ba8ff78daadf7b79f6 100644 GIT binary patch delta 142 zcmdnm$NR6Jw_yw8(uF$57`a4pQZtK7i&Aw9GL!Q%ljBPglX6mpv^WHm#JKp7#U>ks eOA2do2;vYI!XYknN$wJ2MOBOOsTnYdc_byWa delta 21 dcmey@&%3pcw_yw8(uM7Lix{`(En=Fm6aaA$3H$&6 diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 4e8ac3c112..9a22b3302d 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -35621,6 +35621,73 @@ cont { apply_if: "!name" } } +cont { + name: "leisure-picnic_table" + element { + scale: 16 + symbol { + name: "picnic_table-m" + priority: 16485 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15485 + } + } + element { + scale: 17 + symbol { + name: "picnic_table-m" + priority: 16485 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15485 + } + } + element { + scale: 18 + symbol { + name: "picnic_table-m" + priority: 16485 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15485 + } + } + element { + scale: 19 + symbol { + name: "picnic_table-m" + priority: 16485 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15485 + } + } +} cont { name: "leisure-pitch" element { diff --git a/data/editor.config b/data/editor.config index 14aade5421..dfff52fb7d 100644 --- a/data/editor.config +++ b/data/editor.config @@ -724,6 +724,7 @@ + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 002206ff6d..489f2dd6c7 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -151,7 +151,7 @@ railway|tram;150; amenity|toilets;151; deprecated|deprecated;152;x highway|footway|permissive;[highway=footway][access=permissive],[highway=footway][foot=permissive];;name;int_name;153; -deprecated|deprecated;154;x +leisure|picnic_table;154; landuse|construction;155; tourism|viewpoint;156; amenity|atm;157; diff --git a/data/types.txt b/data/types.txt index c4f62223f3..7519056370 100644 --- a/data/types.txt +++ b/data/types.txt @@ -151,7 +151,7 @@ mapswithme *amenity|toilets mapswithme *highway|footway|permissive -mapswithme +*leisure|picnic_table *landuse|construction *tourism|viewpoint *amenity|atm diff --git a/data/visibility.txt b/data/visibility.txt index 07a871d15d..a12946819b 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -536,6 +536,7 @@ world 00000000000000000000 + permissive 00000000001111111111 - private 00000000001111111111 - {} + picnic_table 00000000000000000000 - pitch 00000000000000000000 - playground 00000000000000000000 - recreation_ground 00000000000000000000 -