Merge pull request #994 from Zverik/churches_and_parts

[styles] Churches and building parts
This commit is contained in:
Konstantin Shalnev 2015-12-15 15:30:21 +03:00
commit 9ca0eb3157
13 changed files with 1616 additions and 2 deletions

View file

@ -69,7 +69,15 @@ world +
{}
{}
pharmacy -
place_of_worship -
place_of_worship +
buddhist -
christian -
hindu -
jewish -
muslim -
shinto -
taoist -
{}
police -
post_box -
post_office -
@ -155,6 +163,7 @@ world +
building +
address -
{}
building:part -
communication +
line +
underground -

Binary file not shown.

View file

@ -4124,6 +4124,412 @@ cont {
}
}
}
cont {
name: "amenity-place_of_worship-buddhist"
element {
scale: 16
symbol {
name: "religion"
priority: 16000
}
}
element {
scale: 17
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-place_of_worship-christian"
element {
scale: 16
symbol {
name: "religion"
priority: 16000
}
}
element {
scale: 17
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-place_of_worship-hindu"
element {
scale: 16
symbol {
name: "religion"
priority: 16000
}
}
element {
scale: 17
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-place_of_worship-jewish"
element {
scale: 16
symbol {
name: "religion"
priority: 16000
}
}
element {
scale: 17
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-place_of_worship-muslim"
element {
scale: 16
symbol {
name: "religion"
priority: 16000
}
}
element {
scale: 17
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-place_of_worship-shinto"
element {
scale: 16
symbol {
name: "religion"
priority: 16000
}
}
element {
scale: 17
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-place_of_worship-taoist"
element {
scale: 16
symbol {
name: "religion"
priority: 16000
}
}
element {
scale: 17
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "religion"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-police"
element {
@ -8404,6 +8810,44 @@ cont {
}
}
}
cont {
name: "building:part"
element {
scale: 15
area {
color: 13487540
priority: 1001
}
}
element {
scale: 16
area {
color: 13487540
priority: 1001
}
}
element {
scale: 17
area {
color: 13487540
priority: 1001
}
}
element {
scale: 18
area {
color: 13487540
priority: 1001
}
}
element {
scale: 19
area {
color: 13487540
priority: 1001
}
}
}
cont {
name: "communication-line"
element {

Binary file not shown.

View file

@ -4144,6 +4144,559 @@ cont {
}
}
}
cont {
name: "amenity-place_of_worship-buddhist"
element {
scale: 16
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-m"
priority: 16864
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-place_of_worship-christian"
element {
scale: 16
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-m"
priority: 16864
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-place_of_worship-hindu"
element {
scale: 16
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-m"
priority: 16864
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-place_of_worship-jewish"
element {
scale: 16
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-m"
priority: 16864
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-place_of_worship-muslim"
element {
scale: 16
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-m"
priority: 16864
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-place_of_worship-shinto"
element {
scale: 16
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-m"
priority: 16864
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-place_of_worship-taoist"
element {
scale: 16
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-m"
priority: 16864
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
area {
color: 16316664
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-police"
element {

Binary file not shown.

View file

@ -4144,6 +4144,559 @@ cont {
}
}
}
cont {
name: "amenity-place_of_worship-buddhist"
element {
scale: 16
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-m"
priority: 16864
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-place_of_worship-christian"
element {
scale: 16
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-m"
priority: 16864
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-place_of_worship-hindu"
element {
scale: 16
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-m"
priority: 16864
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-place_of_worship-jewish"
element {
scale: 16
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-m"
priority: 16864
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-place_of_worship-muslim"
element {
scale: 16
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-m"
priority: 16864
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-place_of_worship-shinto"
element {
scale: 16
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-m"
priority: 16864
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-place_of_worship-taoist"
element {
scale: 16
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-m"
priority: 16864
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
area {
color: 3355426
priority: -15136
}
symbol {
name: "place-of-worship-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-police"
element {

View file

@ -1040,3 +1040,11 @@ barrier|border_control;[barrier=border_control];;name;int_name;1039;
shop|laundry;[shop=laundry];;name;int_name;1040;
amenity|vending_machine|parking_tickets;[amenity=vending_machine][vending=parking_tickets];;name;int_name;1041;
amenity|vending_machine|public_transport_tickets;[amenity=vending_machine][vending=public_transport_tickets];;name;int_name;1042;
building:part;[building:part];;name;int_name;1043;
amenity|place_of_worship|christian;[amenity=place_of_worship][religion=christian];;name;int_name;1044;
amenity|place_of_worship|muslim;[amenity=place_of_worship][religion=muslim];;name;int_name;1045;
amenity|place_of_worship|buddhist;[amenity=place_of_worship][religion=buddhist];;name;int_name;1046;
amenity|place_of_worship|hindu;[amenity=place_of_worship][religion=hindu];;name;int_name;1047;
amenity|place_of_worship|shinto;[amenity=place_of_worship][religion=shinto];;name;int_name;1048;
amenity|place_of_worship|jewish;[amenity=place_of_worship][religion=jewish];;name;int_name;1049;
amenity|place_of_worship|taoist;[amenity=place_of_worship][religion=taoist];;name;int_name;1050;

Can't render this file because it has a wrong number of fields in line 371.

View file

@ -574,6 +574,7 @@ node|z15-[leisure=nature_reserve]
{
icon-image: bird.svg;
}
area|z15-[building:part],
area|z15-[building],
node|z15-[building]
{

View file

@ -1040,3 +1040,11 @@ barrier|border_control
shop|laundry
amenity|vending_machine|parking_tickets
amenity|vending_machine|public_transport_tickets
building:part
amenity|place_of_worship|christian
amenity|place_of_worship|muslim
amenity|place_of_worship|buddhist
amenity|place_of_worship|hindu
amenity|place_of_worship|shinto
amenity|place_of_worship|jewish
amenity|place_of_worship|taoist

View file

@ -69,7 +69,15 @@ world 00000000000000000000 +
{}
{}
pharmacy 00000000000000001111 -
place_of_worship 00000000000000001111 -
place_of_worship 00000000000000001111 +
buddhist 00000000000000001111 -
christian 00000000000000001111 -
hindu 00000000000000001111 -
jewish 00000000000000001111 -
muslim 00000000000000001111 -
shinto 00000000000000001111 -
taoist 00000000000000001111 -
{}
police 00000000000000000111 -
post_box 00000000000000000111 -
post_office 00000000000000001111 -
@ -155,6 +163,7 @@ world 00000000000000000000 +
building 00000000000000011111 +
address 00000000000000001111 -
{}
building:part 00000000000000011111 -
communication 00000000000000000000 +
line 00000000000000001111 +
underground 00000000000000001111 -

View file

@ -140,6 +140,29 @@ public:
md.Set(Metadata::FMD_HEIGHT, value);
}
}
else if (k == "min_height")
{
string const & value = ValidateAndFormat_height(v);
if (!value.empty())
md.Set(Metadata::FMD_MIN_HEIGHT, value);
}
else if (k == "building:min_level")
{
// Ignoring if min_height was already set
if (md.Get(Metadata::FMD_MIN_HEIGHT).empty())
{
// Converting this attribute into height
string const & value = ValidateAndFormat_building_levels(v);
if (!value.empty())
md.Set(Metadata::FMD_MIN_HEIGHT, value);
}
}
else if (k == "denomination")
{
string const & value = ValidateAndFormat_denomination(v);
if (!value.empty())
md.Set(Metadata::FMD_DENOMINATION, value);
}
return false;
}
@ -249,5 +272,9 @@ protected:
ss << fixed << setw(2) << setprecision(1) << (val * 3 /*levels multiplied by 3 meters per level*/);
return ss.str();
}
string ValidateAndFormat_denomination(string const & v) const
{
return v;
}
string ValidateAndFormat_wikipedia(string v) const;
};

View file

@ -38,6 +38,8 @@ namespace feature
FMD_MAXSPEED = 17,
FMD_FLATS = 18,
FMD_HEIGHT = 19,
FMD_MIN_HEIGHT = 20,
FMD_DENOMINATION = 21,
FMD_COUNT
};