diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 8e60be556..ef68a3094 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -874,8 +874,10 @@ barrier|kissing_gate;749; barrier|turnstile;750; landuse|industrial|mine;[landuse=industrial][industrial=mine];;name;int_name;751; landuse|flowerbed;752; -deprecated|deprecated;753;x -deprecated|deprecated;754;x +# Used for barrier|yes in OM +deprecated|OM;753;x +# Used for barrier|wicket_gate in OM +deprecated|OM;754;x deprecated|deprecated;755;x deprecated|deprecated;756;x deprecated|deprecated;757;x diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt index 000ae6a27..a3feec0a1 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -398,7 +398,7 @@ railway-subway-bridge::bridgeblack # line::bridgeblack z16- (al building # area z14- (also has caption z16-) building-garage # area z14- (also has caption z16-) -building-guardhouse +building-guardhouse # area z14- (also has icon z18-, caption(optional) z18-) building-has_parts # area z14- (also has caption z16-) building-train_station # area z14- (also has caption z16-) === 130 diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 8cc22c3ec..ed8873eb5 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -755,7 +755,7 @@ tourism-hotel # icon z16- (also has captio amenity-arts_centre # icon z17- (also has caption(optional) z17-) amenity-bank # icon z16- (also has caption(optional) z16-) -amenity-library # icon z18- (also has caption(optional) z18-) +amenity-library # icon z17- (also has caption(optional) z17-) amenity-marketplace # icon z16- (also has caption(optional) z16-, area z15-) amenity-pharmacy # icon z16- (also has caption(optional) z17-) shop-convenience # icon z16- (also has caption(optional) z16-) @@ -1186,7 +1186,7 @@ amenity-shower # icon z17- (also has captio amenity-toilets # icon z18- (also has caption(optional) z18-) man_made-embankment # pathtext z18- (also has line z16-) office # icon z18- (also has caption(optional) z18-) -office-security +office-security # icon z18- (also has caption(optional) z18-) post_office-post_partner # icon z18- (also has caption(optional) z18-) shop # icon z18- (also has caption(optional) z18-) === 470 @@ -1225,7 +1225,7 @@ emergency-emergency_ward_entrance # icon z16- (also has captio building # caption z16- (also has area z14-) building-garage # caption z16- (also has area z14-) -building-guardhouse +building-guardhouse # icon z18- (also has caption(optional) z18-, area z14-) building-has_parts # caption z16- (also has area z14-) power-plant # icon z17- (also has area z13-) power-plant-coal # icon z17- (also has area z13-) @@ -1746,7 +1746,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-arts_centre # caption(optional) z17- (also has icon z17-) # amenity-bank # caption(optional) z16- (also has icon z16-) -# amenity-library # caption(optional) z18- (also has icon z18-) +# amenity-library # caption(optional) z17- (also has icon z17-) # amenity-marketplace # caption(optional) z16- (also has icon z16-, area z15-) # amenity-pharmacy # caption(optional) z17- (also has icon z16-) # shop-convenience # caption(optional) z16- (also has icon z16-) @@ -2128,6 +2128,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-shower # caption(optional) z17- (also has icon z17-) # amenity-toilets # caption(optional) z18- (also has icon z18-) # office # caption(optional) z18- (also has icon z18-) +# office-security # caption(optional) z18- (also has icon z18-) # post_office-post_partner # caption(optional) z18- (also has icon z18-) # shop # caption(optional) z18- (also has icon z18-) # === -9530 @@ -2160,6 +2161,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # emergency-emergency_ward_entrance # caption(optional) z18- (also has icon z16-) # === -9750 +# building-guardhouse # caption(optional) z18- (also has icon z18-, area z14-) # power-plant-wind # caption(optional) z16- (also has icon z15-, area z13-) # === -9770 diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 072b92dc8..3ba5eba92 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -305,7 +305,7 @@ railway-preserved-tunnel # line z13- === 160 highway-footway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) -highway-footway-sidewalk # line z16- +highway-footway-sidewalk # line z13- highway-footway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) highway-path-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) highway-path-horse # line z11- (also has pathtext z13-) @@ -400,7 +400,7 @@ railway-subway-bridge::bridgeblack # line::bridgeblack z16- (al building # area z14- (also has caption z16-) building-garage # area z14- (also has caption z16-) -building-guardhouse +building-guardhouse # area z14- (also has icon z16-, caption(optional) z18-) building-has_parts # area z14- (also has caption z16-) building-train_station # area z14- (also has caption z16-) === 130 diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index f91df4035..abb4bbc03 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -755,7 +755,7 @@ tourism-hotel # icon z16- (also has captio amenity-arts_centre # icon z17- (also has caption(optional) z17-) amenity-bank # icon z16- (also has caption(optional) z16-) -amenity-library # icon z18- (also has caption(optional) z18-) +amenity-library # icon z17- (also has caption(optional) z17-) amenity-marketplace # icon z16- (also has caption(optional) z16-, area z15-) amenity-pharmacy # icon z16- (also has caption(optional) z17-) shop-convenience # icon z16- (also has caption(optional) z16-) @@ -1187,7 +1187,7 @@ amenity-shower # icon z17- (also has captio amenity-toilets # icon z15- (also has caption(optional) z18-) man_made-embankment # pathtext z18- (also has line z16-) office # icon z18- (also has caption(optional) z18-) -office-security +office-security # icon z17- (also has caption(optional) z18-) post_office-post_partner # icon z18- (also has caption(optional) z18-) shop # icon z18- (also has caption(optional) z18-) === 470 @@ -1226,7 +1226,7 @@ emergency-emergency_ward_entrance # icon z16- (also has captio building # caption z16- (also has area z14-) building-garage # caption z16- (also has area z14-) -building-guardhouse +building-guardhouse # icon z16- (also has caption(optional) z18-, area z14-) building-has_parts # caption z16- (also has area z14-) man_made-utility_pole # icon z15- power-plant # icon z17- (also has area z13-) @@ -1749,7 +1749,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-arts_centre # caption(optional) z17- (also has icon z17-) # amenity-bank # caption(optional) z16- (also has icon z16-) -# amenity-library # caption(optional) z18- (also has icon z18-) +# amenity-library # caption(optional) z17- (also has icon z17-) # amenity-marketplace # caption(optional) z16- (also has icon z16-, area z15-) # amenity-pharmacy # caption(optional) z17- (also has icon z16-) # shop-convenience # caption(optional) z16- (also has icon z16-) @@ -2132,6 +2132,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-shower # caption(optional) z17- (also has icon z17-) # amenity-toilets # caption(optional) z18- (also has icon z15-) # office # caption(optional) z18- (also has icon z18-) +# office-security # caption(optional) z18- (also has icon z17-) # post_office-post_partner # caption(optional) z18- (also has icon z18-) # shop # caption(optional) z18- (also has icon z18-) # === -9530 @@ -2165,6 +2166,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # emergency-emergency_ward_entrance # caption(optional) z18- (also has icon z16-) # === -9750 +# building-guardhouse # caption(optional) z18- (also has icon z16-, area z14-) # power-plant-wind # caption(optional) z16- (also has icon z13-, area z13-) # === -9770 diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index 202a30d5b..4b21b54ca 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -353,7 +353,7 @@ man_made-cutline # line z15- barrier-ditch # line z17- building # area z15- (also has caption z18-) building-garage # area z15- (also has caption z18-) -building-guardhouse +building-guardhouse # area z15- (also has icon z18-) building-has_parts # area z15- (also has caption z18-) building-train_station # area z15- (also has caption z18-) === 50 diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 9c905de70..f883b1aed 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -724,7 +724,7 @@ amenity-parcel_locker # icon z17- (also has captio amenity-police # icon z17- amenity-post_office # icon z17- (also has caption(optional) z17-) amenity-toilets # icon z17- (also has caption(optional) z17-) -office-security +office-security # icon z18- post_office-post_partner # icon z18- (also has caption(optional) z18-) shop-motorcycle # icon z17- === 200 @@ -747,7 +747,7 @@ building-has_parts # caption z18- (also has are === 50 building-garage # caption z18- (also has area z15-) -building-guardhouse +building-guardhouse # icon z18- (also has area z15-) === 30 entrance-main # icon z18- (also has caption(optional) z18-) diff --git a/generator/road_access_generator.cpp b/generator/road_access_generator.cpp index 40494ac83..4101d5cbf 100644 --- a/generator/road_access_generator.cpp +++ b/generator/road_access_generator.cpp @@ -16,11 +16,7 @@ #include "defines.hpp" -#include #include -#include -#include -#include #include "3party/opening_hours/opening_hours.hpp"