Index: resources/styles/default/points =================================================================== --- resources/styles/default/points (revision 1082) +++ resources/styles/default/points (working copy) @@ -6,8 +6,12 @@ amenity=atm { name '${operator}: ${name}' | '${name}' | '${operator}' } [0x2f06 resolution 21] amenity=bank { name '${name} (${operator})' | '${name}' | '${operator}' } [0x2f06 resolution 21] amenity=biergarten [0x2d02 resolution 21] -amenity=bus_station [0x2f08 resolution 21] +amenity=border_control [0x3006 resolution 18] +amenity=bus_station [0x2f08 resolution 20] amenity=cafe [0x2a0e resolution 21] +#amenity=car_club [0x2f0d resolution 20] +amenity=car_rental [0x2f02 resolution 20] +amenity=car_sharing [0x2f02 resolution 20] amenity=car_wash [0x2f0e resolution 21] amenity=casino [0x2d04 resolution 20] amenity=cinema [0x2d03 resolution 20] @@ -15,11 +19,13 @@ amenity=concert_hall [0x2c09 resolution 20] amenity=conference_centre [0x2c09 resolution 20] amenity=convention_center [0x2c09 resolution 20] -amenity=community_centre [0x2c09 resolution 20] +amenity=community_centre [0x3005 resolution 20] +amenity=community_center [0x3005 resolution 20] amenity=courthouse [0x3004 resolution 20] amenity=doctors [0x3002 resolution 20] amenity=drinking_water [0x5000 resolution 23 default_name 'Water'] -amenity=emergency_phone [0x5100 resolution 21] +amenity=emergency_phone [0x2f12 resolution 21 default_name 'Emergency Phone'] +amenity=ferry_terminal [0x2f08 resolution 19] amenity=fast_food & cuisine=grill [0x2a03 resolution 20] amenity=fast_food & cuisine=pizza [0x2a0a resolution 20] amenity=fast_food & cuisine='pizza;kebab' [0x2a0a resolution 20] @@ -27,23 +33,26 @@ amenity=fire_station [0x3008 resolution 21] amenity=food_court [0x2a13 resolution 20] amenity=fuel & shop=convenience [ 0x2e06 resolution 19 ] +amenity=fuel & fuel:HGV_diesel=yes [ 0x2f16 resolution 19 ] amenity=fuel { name '${operator}: ${name}' | '${name}' | '${operator}' } [0x2f01 resolution 19 ] amenity=grave_yard [0x6403 resolution 21] amenity=hospital [0x3002 resolution 20] amenity=library [0x2c03 resolution 21] +amenity=nightclub [0x2d02 resolution 21] amenity=parking [0x2f0b resolution 21 default_name 'Parking'] amenity=pharmacy [0x2e05 resolution 20] amenity=place_of_worship [0x2c0b resolution 21] amenity=police [0x3001 resolution 21] amenity=post_office [0x2f05 resolution 20] amenity=pub [0x2d02 resolution 20] -amenity=public_building [0x3000 resolution 21] +amenity=public_building [0x3007 resolution 21] amenity=recycling { name '${name} (${operator})' | '${name}' | '${operator}' } amenity=recycling [0x2f15 resolution 20] amenity=restaurant & cuisine=american [0x2a01 resolution 20] amenity=restaurant & cuisine=asian [0x2a02 resolution 20] amenity=restaurant & cuisine=bagel [0x2a0d resolution 20] amenity=restaurant & cuisine=barbecue [0x2a03 resolution 20] +amenity=restaurant & cuisine=british [0x2a11 resolution 20] amenity=restaurant & cuisine='cafe/diner' [0x2a0e resolution 21] amenity=restaurant & cuisine=chinese [0x2a04 resolution 20] amenity=restaurant & cuisine=deli [0x2a05 resolution 20] @@ -65,9 +74,12 @@ amenity=restaurant & cuisine=* [0x2a13 resolution 20] amenity=restaurant [0x2a00 resolution 20] amenity=school [0x2c05 resolution 20] +amenity=shelter [0x2b05 resolution 20] amenity=supermarket [0x2e02 resolution 20] -amenity=telephone [0x5100 resolution 21 default_name 'Telephone'] +amenity=taxi [0x2f17 resolution 20] +amenity=telephone [0x2f12 resolution 21 default_name 'Telephone'] amenity=theatre [0x2d01 resolution 21] +amenity=toilets & tourism=information [0x2f0c resolution 20] amenity=toilets [0x4e00 resolution 21 default_name 'Toilets' ] amenity=townhall [0x3003 resolution 21] amenity=university [0x2c05 resolution 21] @@ -90,6 +102,7 @@ leisure=marina [0x4300 resolution 21] leisure=park [0x2c06 resolution 21] leisure=pitch [0x2c08 resolution 21] +leisure=playground [0x2c06 resolution 21] leisure=sports_center | leisure=sports_centre [0x2d0a resolution 21] leisure=stadium [0x2c08 resolution 21] leisure=track [0x2c08 resolution 21] @@ -97,16 +110,19 @@ man_made=tower [0x6411 resolution 21] -# Edge 705 displays 0x650a,0x6511,0x6512,0x6513 as hollow white circles, no menu +# Edge 705 displays 0x650a,0x6511,0x6512,0x6513,0x6603,0x6614 as hollow white circles, no menu natural=beach [0x6604 resolution 21] natural=cave_entrance [0x6601 resolution 19] natural=cliff [0x6607 resolution 21] natural=glacier [0x650a resolution 21] natural=peak {name '${name|def:}${ele|height:m=>ft|def:}' } [0x6616 resolution 18] natural=spring [0x6511 resolution 21] +natural=rock [0x6614 resolution 21] #natural=stream [0x6512 resolution 21] natural=volcano [0x2c0c resolution 21] +natural=water [0x6603 resolution 21] natural=wetland [0x6513 resolution 21] +natural=wood [0x6618 resolution 21] place=city [0x0400 resolution 17] place=hamlet [0x1100 resolution 20] @@ -121,9 +137,16 @@ shop=bakers [0x2e02 resolution 20] shop=bakery [0x2e02 resolution 20] -shop=bicycle [0x2e0a resolution 20] -shop=butcher [0x2e00 resolution 20] +shop=beauty [0x2f10 resolution 20] +shop=bicycle [0x2f13 resolution 20] +#shop=boat [0x2f09 resolution 20] +shop=butcher [0x2e0c resolution 20] +shop=car [0x2f07 resolution 20] +shop=car_dealer [0x2f07 resolution 20] +shop=car_parts [0x2f07 resolution 20] +shop=car_rental [0x2f02 resolution 20] shop=car_repair [0x2f03 resolution 20] +#shop=car_wrecker [0x2f0a resolution 20] shop=chemist [0x2e05 resolution 20] shop=clothes [0x2e07 resolution 20] shop=computer [0x2e0b resolution 20] @@ -131,13 +154,18 @@ shop=department_store [0x2e01 resolution 19] shop=doityourself [0x2e09 resolution 20] shop=fashion [0x2e07 resolution 20] +shop=furniture [0x2e09 resolution 20] shop=garden_centre [0x2e08 resolution 20] shop=garden_center [0x2e08 resolution 20] shop=general [0x2e03 resolution 20] shop=hardware [0x2e09 resolution 20] +shop=hairdresser [0x2f10 resolution 20] shop=mall [0x2e04 resolution 20] shop=organic [0x2e0a resolution 20] +shop=shoes [0x2e07 resolution 20] shop=supermarket [0x2e02 resolution 20] +shop=tires [0x2f07 resolution 20] +shop=tyres [0x2f07 resolution 20] shop=* [0x2e0c resolution 20] sport=9pin [0x2d07 resolution 20] @@ -152,12 +180,13 @@ tourism=attraction & historic=* [0x2c02 resolution 20] tourism=attraction [0x2c04 resolution 20] tourism=artwork [0x2c04 resolution 20] +tourism=aquarium [0x2c07 resolution 20] tourism=camp_site [0x2b03 resolution 20] tourism=caravan_site [0x2b03 resolution 20] tourism=guest_house [0x2b02 resolution 20] tourism=hostel [0x2b02 resolution 20] tourism=hotel { name '${name} ${operator}' | '${name}' | '${operator}' } [0x2b01 resolution 20] -tourism=information [0x4c00 resolution 20] +tourism=information [0x2f0c resolution 20] tourism=motel [0x2b01 resolution 20] tourism=museum [0x2c02 resolution 20] tourism=picnic_site [0x4a00 resolution 20] Index: resources/garmin_feature_list.csv =================================================================== --- resources/garmin_feature_list.csv (revision 1082) +++ resources/garmin_feature_list.csv (working copy) @@ -20,7 +20,12 @@ point|0x10|0x00|0x25|exit|toll-booth|Exit (Toll Booth) point|0x10|0x00|0x26|exit|information|Exit (Information) point|0x10|0x00|0x27|exit|exit2|Exit -point|0x10|0x00|0x2f|exit|special|Special +point|0x10|0x00|0x2a|food-and-drink|other-all| +point|0x10|0x00|0x2b|lodging|other-all| +point|0x10|0x00|0x2c|recreation|other-all| +point|0x10|0x00|0x2d|entertainment|other-all| +point|0x10|0x00|0x2e|shopping|other-all| +point|0x10|0x00|0x2f|others|other-all| point|0x10|0x01|0x00|namedpoint|big1|Namedpoint (big) point|0x10|0x01||city|city1|City1 - Large City point|0x10|0x02||city|city2|City2 - Large City @@ -188,7 +193,7 @@ point|0x10|0x1c|0x0b|naval-obstruction||Sounding point|0x10|0x1e|0x00|namedpoint|middle|Namedpoint (middle) point|0x10|0x28|0x00|namedpoint|small4|Namedpoint (small point) -point|0x10|0x2a|0x00|food-and-drink|xxx3|XXX3 +point|0x10|0x2a|0x00|food-and-drink|other-all| point|0x10|0x2a|0x01|food-and-drink|american|Dining(American) point|0x10|0x2a|0x02|food-and-drink|asian|Dining(Asian) point|0x10|0x2a|0x03|food-and-drink|barbecue|Dining(Barbecue) @@ -208,12 +213,83 @@ point|0x10|0x2a|0x11|food-and-drink|british-isles|Dining(British Isle) point|0x10|0x2a|0x12|food-and-drink|speciality-food-products| point|0x10|0x2a|0x13|food-and-drink|other| +point|0x10|0x2a|0x14|food-and-drink|other| +point|0x10|0x2a|0x15|food-and-drink|other| +point|0x10|0x2a|0x16|food-and-drink|other| +point|0x10|0x2a|0x17|food-and-drink|other| +point|0x10|0x2a|0x18|food-and-drink|other| +point|0x10|0x2a|0x19|food-and-drink|other| +point|0x10|0x2a|0x1a|food-and-drink|other| +point|0x10|0x2a|0x1b|food-and-drink|other| +point|0x10|0x2a|0x1c|food-and-drink|other| +point|0x10|0x2a|0x1d|food-and-drink|other| +point|0x10|0x2a|0x1e|food-and-drink|other| +point|0x10|0x2a|0x1f|food-and-drink|other| +point|0x10|0x2a|0x20|food-and-drink|other-all| +point|0x10|0x2a|0x21|food-and-drink|other-all| +point|0x10|0x2a|0x22|food-and-drink|other-all| +point|0x10|0x2a|0x23|food-and-drink|other-all| +point|0x10|0x2a|0x24|food-and-drink|other-all| +point|0x10|0x2a|0x25|food-and-drink|other-all| +point|0x10|0x2a|0x26|food-and-drink|other-all| +point|0x10|0x2a|0x27|food-and-drink|other-all| +point|0x10|0x2a|0x28|food-and-drink|other-all| +point|0x10|0x2a|0x29|food-and-drink|other-all| +point|0x10|0x2a|0x2a|food-and-drink|other-all| +point|0x10|0x2a|0x2b|food-and-drink|other-all| +point|0x10|0x2a|0x2c|food-and-drink|other-all| +point|0x10|0x2a|0x2d|food-and-drink|other-all| +point|0x10|0x2a|0x2e|food-and-drink|other-all| +point|0x10|0x2a|0x2f|food-and-drink|other-all| point|0x10|0x2b|0x00|lodging|hotel|Hotel(Other) point|0x10|0x2b|0x01|lodging|hotel-motel|Hotel/Motel point|0x10|0x2b|0x02|lodging|bed-and-breakfast-inn|Bed&Breakfast inn point|0x10|0x2b|0x03|lodging|campground-rv-park|Camping/RV-Park point|0x10|0x2b|0x04|lodging|resort|Resort point|0x10|0x2b|0x05|lodging|other| +point|0x10|0x2b|0x06|lodging|other| +point|0x10|0x2b|0x07|lodging|other| +point|0x10|0x2b|0x08|lodging|other| +point|0x10|0x2b|0x09|lodging|other| +point|0x10|0x2b|0x0a|lodging|other| +point|0x10|0x2b|0x0b|lodging|other| +point|0x10|0x2b|0x0c|lodging|other| +point|0x10|0x2b|0x0d|lodging|other| +point|0x10|0x2b|0x0e|lodging|other| +point|0x10|0x2b|0x0f|lodging|other| +point|0x10|0x2b|0x10|lodging|other| +point|0x10|0x2b|0x11|lodging|other| +point|0x10|0x2b|0x12|lodging|other| +point|0x10|0x2b|0x13|lodging|other| +point|0x10|0x2b|0x14|lodging|other| +point|0x10|0x2b|0x15|lodging|other| +point|0x10|0x2b|0x16|lodging|other| +point|0x10|0x2b|0x17|lodging|other| +point|0x10|0x2b|0x18|lodging|other| +point|0x10|0x2b|0x19|lodging|other| +point|0x10|0x2b|0x1a|lodging|other| +point|0x10|0x2b|0x1b|lodging|other| +point|0x10|0x2b|0x1c|lodging|other| +point|0x10|0x2b|0x1d|lodging|other| +point|0x10|0x2b|0x1e|lodging|other| +point|0x10|0x2b|0x1f|lodging|other| +point|0x10|0x2b|0x20|lodging|other-all| +point|0x10|0x2b|0x21|lodging|other-all| +point|0x10|0x2b|0x22|lodging|other-all| +point|0x10|0x2b|0x23|lodging|other-all| +point|0x10|0x2b|0x24|lodging|other-all| +point|0x10|0x2b|0x25|lodging|other-all| +point|0x10|0x2b|0x26|lodging|other-all| +point|0x10|0x2b|0x27|lodging|other-all| +point|0x10|0x2b|0x28|lodging|other-all| +point|0x10|0x2b|0x29|lodging|other-all| +point|0x10|0x2b|0x2a|lodging|other-all| +point|0x10|0x2b|0x2b|lodging|other-all| +point|0x10|0x2b|0x2c|lodging|other-all| +point|0x10|0x2b|0x2d|lodging|other-all| +point|0x10|0x2b|0x2e|lodging|other-all| +point|0x10|0x2b|0x2f|lodging|other-all| +point|0x10|0x2c|0x00|recreation|other-all| point|0x10|0x2c|0x01|recreation|amusement-theme-park|Amusement Park point|0x10|0x2c|0x02|attractions|museum-historical|Museum/History point|0x10|0x2c|0x03|community|library|Libraries @@ -237,7 +313,7 @@ point|0x10|0x2d|0x09|recreation|swimming-pool|Swimming point|0x10|0x2d|0x0a|recreation|sports-fitness-center|Sports point|0x10|0x2d|0x0b|recreation|public-sport-airport|Sport Airport -point|0x10|0x2e|0x00|shopping|xxx4|XXX4 +point|0x10|0x2e|0x00|shopping|other-all| point|0x10|0x2e|0x01|shopping|department|Department Store point|0x10|0x2e|0x02|shopping|grocery|Grocery point|0x10|0x2e|0x03|shopping|general-merchandise|General Merchandiser @@ -250,6 +326,42 @@ point|0x10|0x2e|0x0a|shopping|speciality-retail| point|0x10|0x2e|0x0b|shopping|computer-software| point|0x10|0x2e|0x0c|shopping|other| +point|0x10|0x2e|0x0d|shopping|other| +point|0x10|0x2e|0x0e|shopping|other| +point|0x10|0x2e|0x0f|shopping|other| +point|0x10|0x2e|0x10|shopping|other| +point|0x10|0x2e|0x11|shopping|other| +point|0x10|0x2e|0x12|shopping|other| +point|0x10|0x2e|0x13|shopping|other| +point|0x10|0x2e|0x14|shopping|other| +point|0x10|0x2e|0x15|shopping|other| +point|0x10|0x2e|0x16|shopping|other| +point|0x10|0x2e|0x17|shopping|other| +point|0x10|0x2e|0x18|shopping|other| +point|0x10|0x2e|0x19|shopping|other| +point|0x10|0x2e|0x1a|shopping|other| +point|0x10|0x2e|0x1b|shopping|other| +point|0x10|0x2e|0x1c|shopping|other| +point|0x10|0x2e|0x1d|shopping|other| +point|0x10|0x2e|0x1e|shopping|other| +point|0x10|0x2e|0x1f|shopping|other| +point|0x10|0x2e|0x20|shopping|other-all| +point|0x10|0x2e|0x21|shopping|other-all| +point|0x10|0x2e|0x22|shopping|other-all| +point|0x10|0x2e|0x23|shopping|other-all| +point|0x10|0x2e|0x24|shopping|other-all| +point|0x10|0x2e|0x25|shopping|other-all| +point|0x10|0x2e|0x26|shopping|other-all| +point|0x10|0x2e|0x27|shopping|other-all| +point|0x10|0x2e|0x28|shopping|other-all| +point|0x10|0x2e|0x29|shopping|other-all| +point|0x10|0x2e|0x2a|shopping|other-all| +point|0x10|0x2e|0x2b|shopping|other-all| +point|0x10|0x2e|0x2c|shopping|other-all| +point|0x10|0x2e|0x2d|shopping|other-all| +point|0x10|0x2e|0x2e|shopping|other-all| +point|0x10|0x2e|0x2f|shopping|other-all| +point|0x10|0x2f|0x00|others|other-all| point|0x10|0x2f|0x01|fuel-services|auto-fuel|Petrol point|0x10|0x2f|0x02|auto-services|auto-rental|Auto Rental point|0x10|0x2f|0x03|auto-services|auto-repair|Auto Repair @@ -264,24 +376,25 @@ point|0x10|0x2f|0x0c|auto-services|rest-area-tourist-info|Restroom point|0x10|0x2f|0x0d|auto-services|automobile-club|Automobil Club point|0x10|0x2f|0x0e|auto-services|car-wash|Car Wash -point|0x10|0x2f|0x0e|others|garmin-dealer|Car Wash +point|0x10|0x2f|0x0f|others|garmin-dealer| point|0x10|0x2f|0x10|others|personal-service| point|0x10|0x2f|0x11|others|business-service| point|0x10|0x2f|0x12|others|communications| point|0x10|0x2f|0x13|others|repair-service| point|0x10|0x2f|0x14|others|social-service| point|0x10|0x2f|0x15|community|utility| +point|0x10|0x2f|0x16|auto-services|truck-stop| point|0x10|0x2f|0x16|fuel-services|truck-stop| -point|0x10|0x2f|0x16|transportation|transit-service| +point|0x10|0x2f|0x17|transportation|transit-service| point|0x10|0x30|0x00|public|xxx2|XXX2 point|0x10|0x30|0x01|community|police-station|Police station point|0x10|0x30|0x02|hospitals|hospital|Hospital point|0x10|0x30|0x03|community|city-hall| point|0x10|0x30|0x04|community|court-house|Court -point|0x10|0x30|0x05|community|community-center|Disco +point|0x10|0x30|0x05|community|community-center| point|0x10|0x30|0x06|community|border-crossing|Zoll -point|0x10|0x30|0x07|community|government-office|Zoll -point|0x10|0x30|0x08|community|fire-department|Zoll +point|0x10|0x30|0x07|community|government-office| +point|0x10|0x30|0x08|community|fire-department| point|0x10|0x40|0x00|misc|golf-course|Golf point|0x10|0x41|0x00|misc|fishing-spot|Fish point|0x10|0x42|0x00|misc|wreck|Wreck