map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[types] Rebuilt styles with new types

Browse source
This commit is contained in:
Ilya Zverev 2016-04-13 18:36:32 +03:00
parent 74b8923fd7
commit 98c9961850
11 changed files with 4902 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
data/classificator.txt
View file

@ -24,6 +24,7 @@ world +
bar -
bbq -
bench -
bicycle_parking -
bicycle_rental -
brothel -
bureau_de_change -
@ -38,6 +39,8 @@ world +
cinema -
clinic -
college -
community_centre -
courthouse -
dentist -
doctors -
drinking_water -
@ -97,10 +100,13 @@ world +
townhall -
university -
vending_machine +
cigarettes -
drinks -
parking_tickets -
public_transport_tickets -
{}
veterinary -
waste_basket -
waste_disposal -
{}
area:highway +
@ -163,6 +169,7 @@ world +
{}
building +
address -
garage -
train_station -
{}
building:part -
@ -187,6 +194,9 @@ world +
earthquake:damage +
spontaneous_camp -
{}
emergency +
phone -
{}
entrance -
highway +
bridleway +
@ -261,6 +271,7 @@ world +
bridge -
tunnel -
{}
rest_area -
road +
bridge -
tunnel -
@ -318,6 +329,7 @@ world +
permissive -
tunnel -
{}
traffic_signals -
trunk +
bridge -
tunnel -
@ -407,6 +419,7 @@ world +
dog_park +
tennis -
{}
fitness_centre -
garden -
golf_course -
landscape_reserve -
@ -426,6 +439,7 @@ world +
tennis -
{}
recreation_ground -
sauna -
slipway -
sports_centre -
stadium -
@ -436,15 +450,17 @@ world +
man_made +
breakwater -
cairn -
chimney -
cutline -
lighthouse -
pier -
pipeline +
overground -
{}
survey_point -
tower -
wastewater_plant -
water_tower -
water_well -
windmill -
{}
mapswithme +
@ -573,7 +589,7 @@ world +
minor_line -
pole -
station -
sub_station -
substation -
tower -
{}
public_transport +
@ -712,16 +728,20 @@ world +
beauty -
beverages -
bicycle -
bookmaker -
books -
butcher -
car -
car_repair -
car_repair +
tyres -
{}
chemist -
clothes -
computer -
confectionery -
convenience -
copyshop -
cosmetics -
department_store -
doityourself -
dry_cleaning -
@ -740,13 +760,17 @@ world +
mobile_phone -
optician -
outdoor -
pet -
photo -
seafood -
shoes -
sports -
supermarket -
ticket -
toys -
travel_agency -
tyres -
wine -
{}
sport +
american_football -
@ -778,11 +802,14 @@ world +
attraction -
camp_site -
caravan_site -
chalet -
guest_house -
hostel -
hotel -
information +
board -
guidepost -
map -
office -
{}
motel -
@ -791,6 +818,10 @@ world +
viewpoint -
zoo -
{}
traffic_calming +
bump -
hump -
{}
waterway +
canal +
tunnel -

BIN
data/drules_proto.bin
View file

Binary file not shown.

1454
data/drules_proto.txt
View file

File diff suppressed because it is too large Load diff

BIN
data/drules_proto_clear.bin
View file

Binary file not shown.

1305
data/drules_proto_clear.txt
View file

File diff suppressed because it is too large Load diff

BIN
data/drules_proto_dark.bin
View file

Binary file not shown.

1305
data/drules_proto_dark.txt
View file

File diff suppressed because it is too large Load diff

BIN
data/drules_proto_legacy.bin
View file

Binary file not shown.

853
data/drules_proto_legacy.txt
View file

@ -1542,6 +1542,45 @@ cont {
}
}
}
cont {
name: "amenity-bicycle_parking"
element {
scale: 17
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-bicycle_rental"
element {
@ -2294,6 +2333,84 @@ cont {
}
}
}
cont {
name: "amenity-community_centre"
element {
scale: 17
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-courthouse"
element {
scale: 17
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-dentist"
element {
@ -5568,6 +5685,84 @@ cont {
}
}
}
cont {
name: "amenity-vending_machine-cigarettes"
element {
scale: 17
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-vending_machine-drinks"
element {
scale: 17
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-vending_machine-parking_tickets"
element {
@ -5685,6 +5880,45 @@ cont {
}
}
}
cont {
name: "amenity-waste_basket"
element {
scale: 17
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-waste_disposal"
element {
@ -8850,6 +9084,96 @@ cont {
}
}
}
cont {
name: "building-garage"
element {
scale: 15
area {
color: 13487540
priority: 1001
}
}
element {
scale: 16
area {
color: 13487540
priority: 1001
}
caption {
primary {
height: 10
color: 8421488
}
secondary {
height: 11
color: 8421488
offset_y: 20
text: "int_name"
}
priority: 15000
}
}
element {
scale: 17
area {
color: 13487540
priority: 1001
}
caption {
primary {
height: 11
color: 4210752
}
secondary {
height: 11
color: 4210752
offset_y: 20
text: "int_name"
}
priority: 15000
}
}
element {
scale: 18
area {
color: 13487540
priority: 1001
}
caption {
primary {
height: 11
color: 4210752
}
secondary {
height: 11
color: 4210752
offset_y: 20
text: "int_name"
}
priority: 15000
}
}
element {
scale: 19
area {
color: 13487540
priority: 1001
}
caption {
primary {
height: 11
color: 4210752
}
secondary {
height: 11
color: 4210752
offset_y: 20
text: "int_name"
}
priority: 15000
}
}
}
cont {
name: "building-train_station"
element {
@ -47517,51 +47841,6 @@ cont {
}
}
}
cont {
name: "power-sub_station"
element {
scale: 14
area {
color: 12500670
priority: 1001
}
}
element {
scale: 15
area {
color: 12500670
priority: 1001
}
}
element {
scale: 16
area {
color: 12500670
priority: 1001
}
}
element {
scale: 17
area {
color: 12500670
priority: 1001
}
}
element {
scale: 18
area {
color: 12500670
priority: 1001
}
}
element {
scale: 19
area {
color: 12500670
priority: 1001
}
}
}
cont {
name: "power-tower"
element {
@ -62246,6 +62525,45 @@ cont {
}
}
}
cont {
name: "shop-bookmaker"
element {
scale: 17
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "shop-books"
element {
@ -62445,6 +62763,64 @@ cont {
}
}
}
cont {
name: "shop-car_repair-tyres"
element {
scale: 16
symbol {
name: "car_repair"
priority: 16000
}
}
element {
scale: 17
symbol {
name: "car_repair"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "car_repair"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "car_repair"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "shop-chemist"
element {
@ -62717,6 +63093,45 @@ cont {
}
}
}
cont {
name: "shop-cosmetics"
element {
scale: 17
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "shop-department_store"
element {
@ -63569,6 +63984,45 @@ cont {
}
}
}
cont {
name: "shop-pet"
element {
scale: 17
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "shop-photo"
element {
@ -63608,6 +64062,45 @@ cont {
}
}
}
cont {
name: "shop-seafood"
element {
scale: 17
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "shop-shoes"
element {
@ -63768,6 +64261,45 @@ cont {
}
}
}
cont {
name: "shop-ticket"
element {
scale: 17
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "shop-toys"
element {
@ -63885,6 +64417,45 @@ cont {
}
}
}
cont {
name: "shop-wine"
element {
scale: 17
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "sport-american_football"
element {
@ -64834,6 +65405,45 @@ cont {
}
}
}
cont {
name: "tourism-chalet"
element {
scale: 17
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "tourism-guest_house"
element {
@ -65059,6 +65669,57 @@ cont {
}
}
}
cont {
name: "tourism-information-board"
element {
scale: 17
symbol {
name: "information"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "information"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "information"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "tourism-information-guidepost"
element {
@ -65110,6 +65771,108 @@ cont {
}
}
}
cont {
name: "tourism-information-map"
element {
scale: 17
symbol {
name: "information"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "information"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "information"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "tourism-information-office"
element {
scale: 17
symbol {
name: "information"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "information"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "information"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "tourism-information-office"
element {

37
data/types.txt
View file

@ -40,7 +40,7 @@ amenity|place_of_worship
highway|track|grade1
highway|secondary
highway|service|driveway
man_made|survey_point
mapswithme
highway|motorway_link
waterway|stream|intermittent
highway|track|grade4
@ -175,7 +175,7 @@ landuse|village_green
amenity|drinking_water
amenity|university
highway|secondary_link
power|sub_station
power|substation
railway|tram_stop
place|city
amenity|shelter
@ -1068,3 +1068,36 @@ amenity|veterinary
amenity|charging_station
amenity|childcare
natural|wetland|marsh
amenity|bicycle_parking
amenity|community_centre
amenity|courthouse
amenity|vending_machine|cigarettes
amenity|vending_machine|drinks
amenity|waste_basket
building|garage
building|garage
emergency|phone
highway|rest_area
highway|traffic_signals
leisure|fitness_centre
leisure|fitness_centre
leisure|fitness_centre
leisure|sauna
leisure|sauna
man_made|chimney
man_made|tower
man_made|water_well
power|substation
shop|bookmaker
shop|car_repair|tyres
shop|cosmetics
shop|pet
shop|seafood
shop|ticket
shop|wine
tourism|chalet
tourism|information|board
tourism|information|map
tourism|information|office
traffic_calming|bump
traffic_calming|hump

37
data/visibility.txt
View file

@ -24,6 +24,7 @@ world 00000000000000000000 +
bar 00000000000000001111 -
bbq 00000000000000000111 -
bench 00000000000000001111 -
bicycle_parking 00000000000000000111 -
bicycle_rental 00000000000000001111 -
brothel 00000000000000000111 -
bureau_de_change 00000000000000001111 -
@ -38,6 +39,8 @@ world 00000000000000000000 +
cinema 00000000000000001111 -
clinic 00000000000000000111 -
college 00000000000001111111 -
community_centre 00000000000000000111 -
courthouse 00000000000000000111 -
dentist 00000000000000000111 -
doctors 00000000000000001111 -
drinking_water 00000000000000000111 -
@ -97,10 +100,13 @@ world 00000000000000000000 +
townhall 00000000000000001111 -
university 00000000000001111111 -
vending_machine 00000000000000000000 +
cigarettes 00000000000000000111 -
drinks 00000000000000000111 -
parking_tickets 00000000000000000111 -
public_transport_tickets 00000000000000000111 -
{}
veterinary 00000000000000000111 -
waste_basket 00000000000000000111 -
waste_disposal 00000000000000000111 -
{}
area:highway 00000000000000000000 +
@ -163,6 +169,7 @@ world 00000000000000000000 +
{}
building 00000000000000011111 +
address 00000000000000001111 -
garage 00000000000000011111 -
train_station 00000000000000011111 -
{}
building:part 00000000000000011111 -
@ -187,6 +194,9 @@ world 00000000000000000000 +
earthquake:damage 00000000000000000000 +
spontaneous_camp 00000000000000111111 -
{}
emergency 00000000000000000000 +
phone 00000000000000000000 -
{}
entrance 00000000000000000111 -
highway 00000000000000000000 +
bridleway 00000000000001111111 +
@ -261,6 +271,7 @@ world 00000000000000000000 +
bridge 00000000000001111111 -
tunnel 00000000000001111111 -
{}
rest_area 00000000000000000000 -
road 00000000000001111111 +
bridge 00000000000001111111 -
tunnel 00000000000001111111 -
@ -318,6 +329,7 @@ world 00000000000000000000 +
permissive 00000000000001111111 -
tunnel 00000000000001111111 -
{}
traffic_signals 00000000000000000000 -
trunk 00000001111111111111 +
bridge 00000001111111111111 -
tunnel 00000001111111111111 -
@ -407,6 +419,7 @@ world 00000000000000000000 +
dog_park 00000000000011111111 +
tennis 00000000000011111111 -
{}
fitness_centre 00000000000000000000 -
garden 00000000000011111111 -
golf_course 00000000000011111111 -
landscape_reserve 00000000000000000000 -
@ -426,6 +439,7 @@ world 00000000000000000000 +
tennis 00000000000001111111 -
{}
recreation_ground 00000000000011111111 -
sauna 00000000000000000000 -
slipway 00000000000000000111 -
sports_centre 00000000000011111111 -
stadium 00000000000011111111 -
@ -436,15 +450,17 @@ world 00000000000000000000 +
man_made 00000000000000000000 +
breakwater 00000000000000011111 -
cairn 00000000000000000111 -
chimney 00000000000000000000 -
cutline 00000000000011111111 -
lighthouse 00000000000000000111 -
pier 00000000000000111111 -
pipeline 00000000000000001111 +
overground 00000000000000001111 -
{}
survey_point 00000000000000000000 -
tower 00000000000000000000 -
wastewater_plant 00000000000011111111 -
water_tower 00000000000000011111 -
water_well 00000000000000000000 -
windmill 00000000000000000111 -
{}
mapswithme 00000000000000000000 +
@ -573,7 +589,7 @@ world 00000000000000000000 +
minor_line 00000000000000001111 -
pole 00000000000000001111 -
station 00000000000000111111 -
sub_station 00000000000000111111 -
substation 00000000000000000000 -
tower 00000000000000001111 -
{}
public_transport 00000000000000000000 +
@ -712,16 +728,20 @@ world 00000000000000000000 +
beauty 00000000000000000111 -
beverages 00000000000000000111 -
bicycle 00000000000000000111 -
bookmaker 00000000000000000111 -
books 00000000000000000111 -
butcher 00000000000000000111 -
car 00000000000000000111 -
car_repair 00000000000000001111 -
car_repair 00000000000000001111 +
tyres 00000000000000001111 -
{}
chemist 00000000000000000111 -
clothes 00000000000000001111 -
computer 00000000000000000111 -
confectionery 00000000000000000111 -
convenience 00000000000000001111 -
copyshop 00000000000000000111 -
cosmetics 00000000000000000111 -
department_store 00000000000000001111 -
doityourself 00000000000000001111 -
dry_cleaning 00000000000000000111 -
@ -740,13 +760,17 @@ world 00000000000000000000 +
mobile_phone 00000000000000000111 -
optician 00000000000000000111 -
outdoor 00000000000000000111 -
pet 00000000000000000111 -
photo 00000000000000000111 -
seafood 00000000000000000111 -
shoes 00000000000000000111 -
sports 00000000000000000111 -
supermarket 00000000000000001111 -
ticket 00000000000000000111 -
toys 00000000000000000111 -
travel_agency 00000000000000000111 -
tyres 00000000000000000111 -
wine 00000000000000000111 -
{}
sport 00000000000000000000 +
american_football 00000000000000000111 -
@ -778,11 +802,14 @@ world 00000000000000000000 +
attraction 00000000000000011111 -
camp_site 00000000000011111111 -
caravan_site 00000000000011111111 -
chalet 00000000000000000111 -
guest_house 00000000000000001111 -
hostel 00000000000000001111 -
hotel 00000000000000001111 -
information 00000000000000000111 +
board 00000000000000000111 -
guidepost 00000000000000000111 -
map 00000000000000000111 -
office 00000000000000000111 -
{}
motel 00000000000000001111 -
@ -791,6 +818,10 @@ world 00000000000000000000 +
viewpoint 00000000000000011111 -
zoo 00000000000011111111 -
{}
traffic_calming 00000000000000000000 +
bump 00000000000000000000 -
hump 00000000000000000000 -
{}
waterway 00000000000000000000 +
canal 00000000000011111111 +
tunnel 00000000000000000000 -