Commit 3ca46d7bc298aa2bb89eff13f5ea52db35486349 - mkgmap

New upstream version 0.0.0+svn4262 Bas Couwenberg 5 years ago

5 changed file(s) with 199 addition(s) and 114 deletion(s). Raw diff Collapse all Expand all

-2

resources/mkgmap-version.properties less more

0		svn.version: 4260
1		build.timestamp: 2018-12-28T10:15:41+0000
	0	svn.version: 4262
	1	build.timestamp: 2019-01-11T09:35:26+0000

+15

-8

resources/styles/default/inc/access_country less more

3	3
4	4	# Belgium (BEL)
5	5
6		highway=trunk & mkgmap:country=BEL { add bicycle=no; add foot=no }
7		highway=cycleway & mkgmap:country=BEL { add foot=yes }
8		highway=bridleway & mkgmap:country=BEL { add foot=yes }
	6	highway=trunk & mkgmap:country=BEL {add bicycle=no; add foot=no}
	7	highway=cycleway & mkgmap:country=BEL {add foot=yes}
	8	highway=bridleway & mkgmap:country=BEL {add foot=yes}
9	9
10	10	# The Netherlands (NLD)
11	11
12		highway=trunk & mkgmap:country=NLD { add bicycle=no; add foot=no }
13		highway=cycleway & mkgmap:country=NLD { add foot=yes }
14		highway=bridleway & mkgmap:country=NLD { add foot=yes }
	12	highway=trunk & mkgmap:country=NLD {add bicycle=no; add foot=no}
	13	highway=cycleway & mkgmap:country=NLD {add foot=yes}
	14	highway=bridleway & mkgmap:country=NLD {add foot=yes}
15	15
16	16	# Spain (ESP)
17	17
18		highway=trunk & mkgmap:country=ESP { add bicycle=yes; add foot=yes }
19		highway=bridleway & mkgmap:country=ESP { add bicycle=yes; add foot=yes }
	18	highway=trunk & mkgmap:country=ESP {add bicycle=yes; add foot=yes}
	19	highway=bridleway & mkgmap:country=ESP {add bicycle=yes; add foot=yes}
20	20
	21	# United Kingdom (GBR)
21	22
	23	highway=cycleway & mkgmap:country=GBR {add foot=yes}
	24	highway=bridleway & mkgmap:country=GBR {
	25	add bicycle=yes;
	26	add foot=yes;
	27	add motor_vehicle=private
	28	}

+68

-25

resources/styles/default/lines less more

9	9
10	10	addr:housenumber=* {set mkgmap:execute_finalize_rules=true}
11	11
12		aeroway=runway & highway!=* & is_closed()=false {name '${ref}'} [0x27 resolution 20]
13		(aeroway=taxiway \| aeroway=taxilane) & highway!=* & is_closed()=false {name '${ref}'} [0x27 resolution 24]
	12	abandoned=yes {deletealltags} # old, depreciated, ambiguous, method of handling abandoned
	13
	14	# do these as lines regardless of being closed unless explicity marked as area. continue in case also a highway
	15	aeroway=runway & area!=yes {name '${ref}'} [0x27 resolution 20 continue]
	16	(aeroway=taxiway \| aeroway=taxilane) & area!=yes {name '${ref}'} [0x27 resolution 24 continue]
14	17
15	18	# Assign the street name for house number search
16	19	highway=* & name=* {set mkgmap:street='${name}'}
17	20
18	21	# Mark highways with the toll flag
19	22	highway=* & (toll=yes \| toll=true) {set mkgmap:toll=yes}
20
21		# mark multipolygons as area
22		highway=* & mkgmap:mp_created=true {add area=yes}
23	23
24	24	# Hide proposed ways
25	25	highway=proposed \| highway=proposal \| highway=planned \| highway~'.proposed.' {delete highway; delete junction}
26	26	# Hide removed ways
27		highway=razed \| highway=dismantled {deletealltags}
	27	highway=razed \| highway=dismantled \| highway=disused \| highway=demolished {delete highway; delete junction}
28	28	# Hide abandoned ways. Abandoned highways have some evidence of their former existence but are no longer used. These
29	29	# abandoned highways could be useful in topographical maps.
30	30	# https://wiki.openstreetmap.org/wiki/Key:abandoned:
31		(abandoned:highway=* & highway!=*) \| highway=abandoned {deletealltags}
	31	(abandoned:highway=* & (highway!=* \| highway=yes)) \| highway=abandoned {delete highway; delete junction}
32	32	# Hide other non-existent ways
33	33	highway=unbuilt \| highway=neverbuilt \| highway=rejected \| highway~'x-.*' {delete highway; delete junction}
34	34	# Remove highway tag from ways which are not suitable for routing
35		highway=traffic_signals \| highway=junction \| highway=island \| highway=centre_line \| highway=traffic_island \| highway=stopline
	35	highway=traffic_signals \| highway=junction \| highway=island \| highway=centre_line \| highway=traffic_island \| highway=stopline \|
	36	highway=bus_stop \| highway=bus_guideway \| highway=emergency_access_point \| highway=ohm:military:Trench
36	37	{delete highway}
	38	highway=via_ferrata {delete highway} # this shouldn't show as routable on default map: path only for specialists
37	39	highway=piste \| highway=ski {delete highway}
38	40	highway=no \| highway=none {delete highway}
39	41

88	90	(highway=bridleway \| highway=path \| highway=track) & mkgmap:unpaved!=0 {add mkgmap:unpaved=1}
89	91	(highway=unsurfaced \| highway=via_ferrata) {set mkgmap:unpaved=1}
90	92
91		highway=* & mkgmap:unpaved!=1 & smoothness~'.*(bad\|horrible\|impassable)' {add mkgmap:road-speed='-2'}
	93	highway=* & mkgmap:unpaved!=1 & smoothness~'.*(bad\|horrible\|impassable)' {add mkgmap:road-speed=-2}
92	94
93	95	# Good ways without relation
94	96	highway=* & mkgmap:fast_road!=* & (int_ref=* \| network=e-road \| network=AH \| network=TAH \| network=US:I \| network=US:US)

97	99	highway=* & (access=hov \| hov=designated \| oneway=reversible)
98	100	{set mkgmap:road-class=-2; set mkgmap:road-speed=-2; delete mkgmap:fast_road}
99	101
	102	# convert some specific to generic with restrictions (platform is in a bus station)
	103	highway=steps \| highway=corridor \| highway=stepping_stones \| highway=elevator \| highway=escalator \| highway=platform
	104	{set highway=footway; add bicycle=no}
	105	# virtual seems to be a way across a pedestrian area
	106	highway=crossing \| highway=virtual
	107	{set highway=path} # following logic may change
	108
100	109	# Convert generic path to most specific
101		highway=footway & snowplowing!=no & (bicycle=yes \| bicycle=designated \| bicycle=permissive \| bicycle=official)
102		{set highway=cycleway; set bicycle=yes; set foot=yes}
103		highway=path & snowplowing!=no & (bicycle=designated \| bicycle=permissive \| bicycle=official)
104		{set highway=cycleway; set bicycle=yes}
105		highway=path & (horse=designated \| horse=permissive \| horse=official)
106		{set highway=bridleway; set horse=yes}
	110	highway=path & (designation=permissive_bridleway \| designation=public_bridleway)
	111	{set highway=bridleway; add foot=yes}
	112	highway=path & (designation=permissive_footpath \| designation=public_footpath)
	113	{set highway=footway; add foot=designated}
	114	highway=path & snowplowing!=no & (bicycle=designated \| bicycle=permissive \| bicycle=official \| cycleway=lane)
	115	{set highway=cycleway; add foot=yes}
	116	highway=path & foot=designated
	117	{set highway=footway}
107	118
108	119	leisure=track & area!=yes {add highway=footway; name '${name} (${sport})' \| '${name}'}
109		(man_made=pier \| man_made=piste:halfpipe) & area!=yes {add highway=footway; name '${ref} ${name}' \| '${ref}' \| '${name}'}
	120	man_made=pier \| man_made=piste:halfpipe {add highway=footway; name '${ref} ${name}' \| '${ref}' \| '${name}'}
110	121
111	122	# Roundabouts
112	123	junction=roundabout & (highway=trunk \| highway=trunk_link) [0x0c road_class=4 road_speed=2 resolution 24 continue]

127	138	junction=roundabout & (highway=tertiary \| highway=tertiary_link) [0x0c road_class=1 road_speed=1 resolution 24 continue]
128	139	junction=roundabout & (highway=tertiary \| highway=tertiary_link) [0x10804 resolution 21]
129	140
130		junction=roundabout & (highway=unclassified \| highway=minor ) [0x0c road_class=1 road_speed=1 resolution 21]
	141	junction=roundabout & (highway=unclassified \| highway=minor) [0x0c road_class=1 road_speed=1 resolution 21]
131	142	junction=roundabout & highway=* [0x0c road_class=0 road_speed=1 resolution 22]
132	143
133	144	# Ways that may or may not be useable

166	177	highway=minor [0x06 road_class=1 road_speed=3 resolution 21]
167	178	highway=unclassified [0x06 road_class=0 road_speed=3 resolution 21]
168	179
169		# Some countries allow, others disallow bicycling on pedestrian streets.
170		# To allow bicycling, add 'add bicycle=yes'
171		highway=pedestrian & area!=yes [0x16 road_class=0 road_speed=0 resolution 22]
	180	highway=yes {set highway=footway} # fix common bad tagging - little bits of path to join other routable ways
	181
	182	# Some countries allow, others disallow bicycling on pedestrian streets. See inc/access_country
	183
	184	# highway=pedestrian could be closed polygon to represent a 'square', add route regardless and continue for polygon processing
	185	highway=pedestrian {set tmp:stopMopUp=yes} [0x16 road_class=0 road_speed=0 resolution 22 continue with_actions]
	186
172	187	highway=living_street [0x06 road_class=0 road_speed=1 resolution 22]
173	188	highway=residential [0x06 road_class=0 road_speed=2 resolution 22]
174	189	highway=bridleway [0x07 road_class=0 road_speed=0 resolution 23]
175	190	highway=byway [0x16 road_class=0 road_speed=0 resolution 23]
176	191
	192	highway=driveway {set highway=service; add service=driveway} # fix common bad tagging
	193	highway=access {set highway=service} # fix common bad tagging
	194	highway=access_ramp {set highway=footway} # proposed
	195
177	196	highway=service & service=parking_aisle [0x07 road_class=0 road_speed=1 resolution 24]
178		highway=service & (service=alley\|service=driveway) [0x07 road_class=0 road_speed=0 resolution 23]
	197	highway=service & (service=alley \| service=driveway) [0x07 road_class=0 road_speed=0 resolution 23]
179	198	highway=service [0x07 road_class=0 road_speed=2 resolution 22]
180	199
181	200	highway=cycleway [0x07 road_class=0 road_speed=1 resolution 23]
182	201
183		highway=footway \| highway=path \| highway=steps [0x16 road_class=0 road_speed=0 resolution 23]
	202	# highway=footway is often an area as well, continue for polygon processing
	203	highway=footway {set tmp:stopMopUp=yes} [0x16 road_class=0 road_speed=0 resolution 23 continue with_actions]
	204
	205	highway=trail {set highway=path; add bicycle=no} # fix common bad tagging
	206
	207	highway=path [0x16 road_class=0 road_speed=0 resolution 23]
184	208	highway=track [0x0a road_class=0 road_speed=1 resolution 22]
185	209	highway=unsurfaced [0x0a road_class=0 road_speed=1 resolution 22]
186	210	highway=road {add mkgmap:dead-end-check=false} [0x06 road_class=0 road_speed=1 resolution 22]
187	211
	212	# handle some rarer bits of road. Do just in case joining paths or bits of one-way roads
	213	highway=turning_loop \| highway=turning_circle \| highway=layby \| highway=escape \| highway=emergency_bay
	214	[0x07 road_class=0 road_speed=0 resolution 24]
	215
	216	# These are too specialized to have routing, so shouldn't drop into the mop-up, but, maybe needing TYP, can be shown on the map
	217	highway=raceway \| highway=gallop {add name='${highway}'} [0x30 resolution 23]
	218
	219	# Don't have routable for either of these:
	220	# most 'rest_area' don't connect to the main road
	221	# 'services' is normally a big area that covers the whole complex
	222	highway=rest_area \| highway=services {set tmp:stopMopUp=yes}
	223
188	224	# Mop up any unrecognised highway types
189		highway=* & area!=yes [0x07 road_class=0 road_speed=0 resolution 23]
	225	#highway=* & tmp:stopMopUp!=yes {echotags 'mop-up highway'} # mostly actual road names
	226	# It is considered best not to process unrecognised highway types
	227	#highway=* & area!=yes & tmp:stopMopUp!=yes [0x07 road_class=0 road_speed=0 resolution 23]
190	228
191	229	natural=coastline [0x15 resolution 12]
192	230	power=line [0x29 resolution 21]
193	231
	232	# following really should be removed, but see: http://www.mkgmap.org.uk/pipermail/mkgmap-dev/2016q3/025104.html
194	233	railway=abandoned [0x0a road_class=0 road_speed=1 resolution 22]
195	234	railway=platform [0x16 road_class=0 road_speed=0 resolution 23]
196	235	# Railway lines, note that many devices display type 0x14 only at resolution 24

224	263	waterway=rapids\|waterway=waterfall [0x1f resolution 22]
225	264	waterway=stream \| waterway=drain [0x18 resolution 22]
226	265
	266	# mop up any remaining water lines
	267	waterway=* & waterway!=no & (area=no \| (is_closed()=false & mkgmap:mp_created!=true))
	268	{add name='${waterway\|subst:"_=> "}'} [0x26 resolution 24]
	269
227	270	include 'inc/contour_lines';
228	271
229	272	<finalize>

242	285	mkgmap:bicycle=yes & (mkgmap:foot=no & mkgmap:car=no & mkgmap:street!=* \| mkgmap:synthesised=yes) {set mkgmap:numbers=false}
243	286
244	287	# Display highway shield for mayor roads if they have a ref and make them searchable by their name
245		(highway=motorway \| highway=trunk) & ref=* {name '${ref\|highway-symbol:hbox}'; addlabel '${name}'}
246		highway=primary & ref=* {name '${ref\|highway-symbol:box}'; addlabel '${name}'}
	288	(highway=motorway \| highway=trunk) & ref=* {name '${ref\|highway-symbol:hbox}'; addlabel '${name}'}
	289	highway=primary & ref=* {name '${ref\|highway-symbol:box}' ; addlabel '${name}'}
247	290	(highway=secondary \| highway=tertiary) & ref=* {name '${ref\|highway-symbol:oval}'; addlabel '${name}'}
248	291
249	292	name=* {name '${name}'}

+90

-66

resources/styles/default/points less more

63	63
64	64	include 'inc/name';
65	65
66		place=city & population > 999999 & name=* {set tmp:city=yes} [0x0100 resolution 12 continue with_actions]
67		place=city & population > 799999 & tmp:city!=yes & name=* {set tmp:city=yes} [0x0200 resolution 14 continue with_actions]
68		place=city & population > 399999 & tmp:city!=yes & name=* {set tmp:city=yes} [0x0300 resolution 15 continue with_actions]
69		place=city & population > 299999 & tmp:city!=yes & name=* {set tmp:city=yes} [0x0400 resolution 16 continue with_actions]
70		place=city & population > 199999 & tmp:city!=yes & name=* {set tmp:city=yes} [0x0500 resolution 16 continue with_actions]
71		place=city & population > 99999 & tmp:city!=yes & name=* {set tmp:city=yes} [0x0600 resolution 17 continue with_actions]
72		place=city & population > 49999 & tmp:city!=yes & name=* {set tmp:city=yes} [0x0700 resolution 17 continue with_actions]
73		place=city & population > 9999 & tmp:city!=yes & name=* {set tmp:city=yes} [0x0800 resolution 18 continue with_actions]
74
75		place=city & population > 0 & tmp:city!=yes & name=* {set tmp:city=yes} [0x0800 resolution 18 continue with_actions]
76		place=city & tmp:city!=yes & name=* {set tmp:city=yes} [0x0700 resolution 18 continue with_actions]
77
78		place=town & population > 69999 & tmp:city!=yes & name=* {set tmp:city=yes} [0x0600 resolution 17 continue with_actions]
79		place=town & population > 19999 & tmp:city!=yes & name=* {set tmp:city=yes} [0x0700 resolution 18 continue with_actions]
80		place=town & population > 9999 & tmp:city!=yes & name=* {set tmp:city=yes} [0x0800 resolution 19 continue with_actions]
81		place=town & population > 4999 & tmp:city!=yes & name=* {set tmp:city=yes} [0x0900 resolution 19 continue with_actions]
82		place=town & population > 999 & tmp:city!=yes & name=* {set tmp:city=yes} [0x0a00 resolution 19 continue with_actions]
83		place=town & population > 0 & tmp:city!=yes & name=* {set tmp:city=yes} [0x0b00 resolution 20 continue with_actions]
84		place=town & tmp:city!=yes & name=* {set tmp:city=yes} [0x0800 resolution 19 continue with_actions]
85
86		place=island & tmp:city!=yes {set tmp:city=yes} [0x650c resolution 20 continue with_actions]
87		place=islet & tmp:city!=yes {set tmp:city=yes} [0x650c resolution 22 continue with_actions]
88		place=village & tmp:city!=yes {set tmp:city=yes} [0x0900 resolution 22 continue with_actions]
89		place=suburb & tmp:city!=yes {set tmp:city=yes} [0x0a00 resolution 22 continue with_actions]
90		place=hamlet & tmp:city!=yes {set tmp:city=yes} [0x0b00 resolution 24 continue with_actions]
	66	place=city & population > 999999 & name=* [0x0100 resolution 12]
	67	place=city & population > 799999 & name=* [0x0200 resolution 14]
	68	place=city & population > 399999 & name=* [0x0300 resolution 15]
	69	place=city & population > 299999 & name=* [0x0400 resolution 16]
	70	place=city & population > 199999 & name=* [0x0500 resolution 16]
	71	place=city & population > 99999 & name=* [0x0600 resolution 17]
	72	place=city & population > 49999 & name=* [0x0700 resolution 17]
	73	place=city & population > 9999 & name=* [0x0800 resolution 18]
	74
	75	place=city & population > 0 & name=* [0x0800 resolution 18]
	76	place=city & name=* [0x0700 resolution 18]
	77
	78	place=town & population > 69999 & name=* [0x0600 resolution 17]
	79	place=town & population > 19999 & name=* [0x0700 resolution 18]
	80	place=town & population > 9999 & name=* [0x0800 resolution 19]
	81	place=town & population > 4999 & name=* [0x0900 resolution 19]
	82	place=town & population > 999 & name=* [0x0a00 resolution 19]
	83	place=town & population > 0 & name=* [0x0b00 resolution 20]
	84	place=town & name=* [0x0800 resolution 19]
	85
	86	place=village & name=* [0x0900 resolution 22]
	87	place=suburb & name=* [0x0a00 resolution 22]
	88	place=hamlet & name=* [0x0b00 resolution 24]
	89
	90	place=island & name=* [0x650c resolution 20]
	91	place=islet & name=* [0x650c resolution 22]
91	92
92	93	#aeroway=airport [0x5900 resolution 22]
93	94	aeroway=airport [0x2f04 resolution 22]

122	123	amenity=embassy & country!=* [0x3003 resolution 24 default_name 'Embassy']
123	124	amenity=emergency_phone [0x2f12 resolution 24 default_name 'Emergency Phone']
124	125	amenity=ferry_terminal [0x2f08 resolution 22]
125
126		amenity=fast_food & cuisine=grill [0x2a03 resolution 24]
127		amenity=fast_food & cuisine~'.pizza.' [0x2a0a resolution 24]
128		amenity=fast_food & cuisine=* {add name='${cuisine\|subst:"_=> "}'} [0x2a07 resolution 24]
129		amenity=fast_food [0x2a07 resolution 24]
130
	126	# handle amenity=fast_food rules later in file
131	127	amenity=fire_station [0x3008 resolution 24]
132	128	amenity=food_court [0x2a13 resolution 24]
133	129	amenity=fuel & fuel:HGV_diesel=yes [0x2f16 resolution 23]

148	144	amenity=pub [0x2d02 resolution 24]
149	145	amenity=public_building [0x3007 resolution 24]
150	146	amenity=recycling [0x2f15 resolution 24 default_name 'Recycling']
151
152		amenity=restaurant & cuisine=american [0x2a01 resolution 24]
153		amenity=restaurant & cuisine=asian [0x2a02 resolution 24]
154		amenity=restaurant & cuisine=bagel [0x2a0d resolution 24]
155		amenity=restaurant & cuisine=barbecue [0x2a03 resolution 24]
156		amenity=restaurant & cuisine=british [0x2a11 resolution 24]
157		amenity=restaurant & cuisine=chinese [0x2a04 resolution 24]
158		amenity=restaurant & cuisine=curry [0x2a02 resolution 24]
159		amenity=restaurant & cuisine=deli [0x2a05 resolution 24]
160		amenity=restaurant & cuisine=french [0x2a0f resolution 24]
161		amenity=restaurant & cuisine=fish_and_chips [0x2a11 resolution 24]
162		amenity=restaurant & (cuisine=german \| cuisine=bavarian) [0x2a10 resolution 24]
163		amenity=restaurant & cuisine=grill [0x2a03 resolution 24]
164		amenity=restaurant & cuisine=indian [0x2a02 resolution 24]
165		amenity=restaurant & cuisine=international [0x2a06 resolution 24]
166		amenity=restaurant & cuisine=italian [0x2a08 resolution 24]
167		amenity=restaurant & cuisine=japanese [0x2a02 resolution 24]
168		amenity=restaurant & cuisine=korean [0x2a02 resolution 24]
169		amenity=restaurant & cuisine=mexican [0x2a09 resolution 24]
170		amenity=restaurant & cuisine~'.pizza.' [0x2a0a resolution 24]
171		amenity=restaurant & cuisine=sea_food [0x2a0b resolution 24]
172		# often "seafood" is used instead of official tag "sea_food"
173		amenity=restaurant & cuisine=seafood [0x2a0b resolution 24]
174		amenity=restaurant & cuisine=spanish [0x2a09 resolution 24]
175		amenity=restaurant & cuisine=speciality [0x2a12 resolution 24]
176		amenity=restaurant & cuisine=steak [0x2a0c resolution 24]
177		amenity=restaurant & cuisine=thai [0x2a02 resolution 24]
178		amenity=restaurant & cuisine=* {add name='${cuisine\|subst:"_=> "}'} [0x2a13 resolution 24]
179		amenity=restaurant [0x2a00 resolution 24]
180
	147	# handle amenity=restaurant rules later in file
181	148	amenity=school [0x2c05 resolution 24]
182	149	# amenity=shelter is ambiguous; when possible, consider using other tags:
183	150	# tourism=lean_to or tourism=picnic_site
184	151	# shelter=yes on highway=bus_stop or highway=tram_stop or railway=halt
185		amenity=shelter [0x2b06 resolution 24 default_name 'Shelter']
	152	amenity=shelter & shelter_type!=public_transport [0x2b06 resolution 24 default_name 'Shelter']
186	153	# amenity=supermarket is superceded by shop=supermarket
187	154	amenity=supermarket [0x2e02 resolution 24]
188	155	amenity=taxi [0x2f17 resolution 24]

216	183	leisure=marina [0x4300 resolution 24]
217	184	leisure=nature_reserve & name=* [0x6612 resolution 24]
218	185	leisure=park [0x2c06 resolution 24]
219		leisure=pitch {name '${name} (${sport})' \| '${name}'} [0x2c08 resolution 24]
	186	leisure=pitch {name '${name} (${sport})' \| '${sport}'} [0x2c08 resolution 24]
220	187	leisure=playground [0x2c06 resolution 24 default_name 'Playground']
221	188	leisure=recreation_ground [0x2c08 resolution 24 default_name 'Rec.']
222		leisure=sports_center \| leisure=sports_centre {name '${name} (${sport})' \| '${name}'} [0x2d0a resolution 24]
223		leisure=stadium {name '${name} (${sport})' \| '${name}'} [0x2c08 resolution 24]
	189	leisure=sports_center \| leisure=sports_centre {name '${name} (${sport})' \| '${sport}'} [0x2d0a resolution 24]
	190	leisure=stadium {name '${name} (${sport})' \| '${sport}'} [0x2c08 resolution 24]
224	191	leisure=swimming_pool [0x2d09 resolution 24]
225		leisure=track {name '${name} (${sport})' \| '${name}'} [0x2c08 resolution 24]
	192	leisure=track {name '${name} (${sport})' \| '${sport}'} [0x2c08 resolution 24]
226	193	leisure=water_park [0x2d09 resolution 24]
227	194
228	195	man_made=tower \| man_made=mast \| landmark=chimney [0x6411 resolution 24]

305	272	tourism=* & tourism!=yes & tourism!=no {add name='${tourism\|subst:"_=> "}'}
306	273	tourism=* & tourism!=no [0x2c0d resolution 24]
307	274
	275	# amenity=restaurant/fast_food/cafe/pub and shop=* can use cuisine, so have cuisine section later than where the others
	276	# should take precedence
	277	# Have the following 2 lines here rather than after cuisine=... so that, for amenity=fast_food, cuisine is ignored
	278	amenity=fast_food & cuisine=* {add name='${cuisine\|subst:"_=> "}'} [0x2a07 resolution 24]
	279	amenity=fast_food [0x2a07 resolution 24]
	280
	281	# "Food & Drink" Search has categories as follows, corresponding to 0x2a00 - 0x2a13:
	282	# All, American, Asian, Barbeque, Chinese, Deli/Bakery, International, Fast Food, Italian, Mexican, Pizza,
	283	# Seafood, Steak/Grill, Bagel/Donut, Cafe/Diner, French, German, British Isles, Speciality Food Products, Other
	284	amenity=restaurant & cuisine!=*
	285	[0x2a00 resolution 24]
	286	cuisine=american \| cuisine=burger
	287	[0x2a01 resolution 24]
	288	cuisine=asian \| cuisine=japanese \| cuisine=indian \| cuisine=curry \| cuisine=thai \| cuisine=sushi \| cuisine=korean
	289	[0x2a02 resolution 24]
	290	cuisine=barbecue \| cuisine=bbq \| cuisine=kebab \| cuisine=chicken
	291	[0x2a03 resolution 24]
	292	cuisine=chinese \| cuisine=vietnamese
	293	[0x2a04 resolution 24]
	294	cuisine=deli \| cuisine=sandwich
	295	[0x2a05 resolution 24]
	296	cuisine=international
	297	[0x2a06 resolution 24]
	298	cuisine=fast_food
	299	[0x2a07 resolution 24]
	300	cuisine=italian \| cuisine=pasta
	301	[0x2a08 resolution 24]
	302	cuisine=mexican \| cuisine=spanish \| cuisine=tapas
	303	[0x2a09 resolution 24]
	304	cuisine~'.pizza.'
	305	[0x2a0a resolution 24]
	306	cuisine=seafood \| cuisine=sea_food \| cuisine=fish
	307	[0x2a0b resolution 24]
	308	cuisine=steak \| cuisine=grill \| cuisine=steak_house
	309	[0x2a0c resolution 24]
	310	cuisine=bagel \| cuisine=donut
	311	[0x2a0d resolution 24]
	312	cuisine=cafe \| cuisine=diner \| cuisine=coffee_shop
	313	[0x2a0e resolution 24]
	314	cuisine=french
	315	[0x2a0f resolution 24]
	316	cuisine=german \| cuisine=bavarian
	317	[0x2a10 resolution 24]
	318	cuisine=british \| cuisine=fish_and_chips
	319	[0x2a11 resolution 24]
	320	cuisine=speciality \| cuisine=local \| cuisine=regional
	321	[0x2a12 resolution 24]
	322	amenity=restaurant {add name='${cuisine\|subst:"_=> "}'}
	323	[0x2a13 resolution 24]
	324	#common ones not handled:
	325	# ice_cream,greek,turkish,noodle,portugese,pasties,lebanese,brazilian,mediterranean,oriental,caribbean,vegetarian
	326
	327	# Have the following 2 lines here rather than before cuisine=... so that, for amenity=fast_food, cuisine is respected
	328	#amenity=fast_food & cuisine=* {add name='${cuisine\|subst:"_=> "}'} [0x2a07 resolution 24]
	329	#amenity=fast_food [0x2a07 resolution 24]
	330
308	331	barrier=bollard \| barrier=bus_trap \| barrier=gate [0x660f resolution 24]
309	332	barrier=block \| barrier=cycle_barrier \| barrier=stile \| barrier=kissing_gate [0x660f resolution 24]
310	333

314	337	natural=glacier [0x650a resolution 24]
315	338	natural=spring [0x6511 resolution 24]
316	339	natural=stream [0x6512 resolution 24]
	340	natural=water & (water=canal \| water=lock) & name=* [0x6505 resolution 24]
317	341	natural=water & name=* [0x6603 resolution 24]
318	342	natural=waterfall \| waterway=waterfall [0x6508 resolution 24]
319	343	natural=wetland & name=* [0x6513 resolution 24]

+24

-13

resources/styles/default/polygons less more

16	16
17	17	aeroway=airport [0x07 resolution 20]
18	18	aeroway=aerodrome [0x07 resolution 20]
19		aeroway=runway {name '${ref}'} [0x0e resolution 20]
20		aeroway=taxiway \| aeroway=taxilane {name '${ref}'} [0x0e resolution 24]
	19	aeroway=runway & area=yes {name '${ref}'} [0x0e resolution 20]
	20	(aeroway=taxiway \| aeroway=taxilane) & area=yes {name '${ref}'} [0x0e resolution 24]
21	21	aeroway=heliport [0x07 resolution 20]
22	22	aeroway=helipad [0x0e resolution 22]
23	23
24	24	amenity=kindergarten [0x0a resolution 22]
25		amenity=cafe \| amenity=fast_food \| amenity=restaurant \| amenity=food_court [0x08 resolution 22]
	25	amenity=cafe \| amenity=fast_food \| amenity=restaurant [0x08 resolution 24]
	26	amenity=food_court [0x08 resolution 22]
26	27	amenity=college [0x0a resolution 22]
27	28	parking=underground \| parking=multi-storey [0x06 resolution 22]
28	29	amenity=parking \| parking=surface [0x05 resolution 22]

50	51	leisure=water_park [0x09 resolution 21]
51	52
52	53	place=village [0x03 resolution 19]
	54	place=suburb [0x02 resolution 19]
53	55
54	56	shop=* {add name='${shop\|subst:"_=> "}'} [0x08 resolution 22]
55	57
56	58	# squares and plazas
	59	place=square [0x17 resolution 22]
57	60	highway=pedestrian & (area=yes \| mkgmap:mp_created=true) [0x17 resolution 22]
58		# other highways that have area=yes set must be parking lots
59		highway=* & (area=yes \| mkgmap:mp_created=true) [0x05 resolution 22]
	61	# following rule also renders a closed way without area attribute as a plaza
	62	highway=pedestrian & area!=no [0x17 resolution 22]
60	63
61		historic=museum \| historic=memorial [0x1e resolution 21]
62		historic=archaeological_site \| historic=ruins [0x1e resolution 21]
	64	# footways areas are similar, but should be explicity marked as such
	65	highway=footway & area=yes [0x17 resolution 24]
	66
	67	# other highways that have area=yes are probably parking lots, eg services/rest_area
	68	(highway=services \| highway=rest_area) & area!=no [0x05 resolution 22]
	69
	70	historic=* & historic!=no & historic!=yes & boundary!=* {add name='${historic\|subst:"_=> "}'} [0x1e resolution 21]
63	71
64	72	landuse=basin [0x3f resolution 20]
65	73	landuse=reservoir \| (natural=water & water=reservoir) [0x3f resolution 20]
	74
	75	dock=drydock [0x4c resolution 22] # might also have natural=water
66	76
67	77	natural=bay [0x3d resolution 18]
68	78	natural=glacier [0x4d resolution 18]
69	79	natural=marsh [0x51 resolution 20]
70	80	natural=mud [0x51 resolution 20]
71	81	natural=wetland [0x51 resolution 20]
	82	natural=water & water=canal [0x48 resolution 22]
	83	natural=water & water=lock [0x4c resolution 22 default_name 'Lock']
	84	natural=water & area_size() < 100000 [0x41 resolution 22] # Small Lake
72	85	natural=water [0x3c resolution 18]
73	86	natural=waterfall \| waterway=waterfall [0x47 resolution 21]
74	87	natural=sea {add mkgmap:skipSizeFilter=true; set mkgmap:drawLevel=2} [0x32 resolution 10]
75	88
76	89	waterway=riverbank [0x46 resolution 20]
	90
	91	# mop up any remaining water areas
	92	waterway=* & waterway!=no & area!=no {add name='${waterway\|subst:"_=> "}'} [0x3b resolution 22]
77	93
78	94	landuse=allotments [0x4e resolution 21]
79	95	landuse=cemetery \| landuse=cemetary \| amenity=grave_yard [0x1a resolution 21]

109	125	tourism=* & area!=no & waterway!=* {add name='${tourism\|subst:"_=> "}'} [0x1f resolution 24]
110	126
111	127	# man_made can be used on areas or lines
112		man_made=* & area!=no & (
113		man_made!=door & man_made!=embankment & man_made!=breakwater & man_made!=cable_line & man_made!=cutline &
114		man_made!=cutting & man_made!=levee & man_made!=trench & man_made!=groyne & man_made!=reinforced_slope)
115		{add name='${man_made\|subst:"_=> "}'} [0x13 resolution 24]
116
117		man_made=* & area=yes {add name='${man_made\|subst:"_=> "}'} [0x13 resolution 24]
	128	man_made=* & area!=no {add name='${man_made\|subst:"_=> "}'} [0x13 resolution 24]
118	129
119	130	# render small named islands
120	131	place=island & name=* & area_size() < 1000000 [0x53 resolution 19]