pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[styles] Remove vegan restaurants from the classificator

Browse source
This commit is contained in:
Ilya Zverev 2016-03-03 19:55:18 +03:00 • committed by Sergey Yershov
parent 58c73faeb3
commit eca2f480dc
12 changed files with 6 additions and 736 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/classificator.txt
View file

@ -83,10 +83,7 @@ world +
post_office -
pub -
recycling -
restaurant +
vegan -
vegetarian -
{}
restaurant -
school -
shelter -
speed_trap -

BIN
data/drules_proto.bin
View file

Binary file not shown.

158
data/drules_proto.txt
View file

@ -5599,164 +5599,6 @@ cont {
}
}
}
cont {
name: "amenity-restaurant-vegan"
element {
scale: 13
symbol {
name: "restaurant"
priority: 16000
}
}
element {
scale: 14
symbol {
name: "restaurant"
priority: 16000
}
}
element {
scale: 15
symbol {
name: "restaurant"
priority: 16000
}
}
element {
scale: 16
symbol {
name: "restaurant"
priority: 16000
}
}
element {
scale: 17
symbol {
name: "restaurant"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "restaurant"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "restaurant"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-restaurant-vegetarian"
element {
scale: 13
symbol {
name: "restaurant"
priority: 16000
}
}
element {
scale: 14
symbol {
name: "restaurant"
priority: 16000
}
}
element {
scale: 15
symbol {
name: "restaurant"
priority: 16000
}
}
element {
scale: 16
symbol {
name: "restaurant"
priority: 16000
}
}
element {
scale: 17
symbol {
name: "restaurant"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "restaurant"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "restaurant"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-school"
element {

BIN
data/drules_proto_clear.bin
View file

Binary file not shown.

224
data/drules_proto_clear.txt
View file

@ -6444,230 +6444,6 @@ cont {
}
}
}
cont {
name: "amenity-restaurant-vegan"
element {
scale: 13
symbol {
name: "restaurant-s"
priority: 16864
min_distance: 10
}
caption {
primary {
height: 10
color: 4473924
offset_y: 6
}
priority: 15864
}
}
element {
scale: 14
symbol {
name: "restaurant-s"
priority: 16864
min_distance: 10
}
caption {
primary {
height: 10
color: 4473924
offset_y: 6
}
priority: 15864
}
}
element {
scale: 15
symbol {
name: "restaurant-m"
priority: 16864
min_distance: 20
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 16
symbol {
name: "restaurant-m"
priority: 16864
min_distance: 10
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
symbol {
name: "restaurant-l"
priority: 16864
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
symbol {
name: "restaurant-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
symbol {
name: "restaurant-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-restaurant-vegetarian"
element {
scale: 13
symbol {
name: "restaurant-s"
priority: 16864
min_distance: 10
}
caption {
primary {
height: 10
color: 4473924
offset_y: 6
}
priority: 15864
}
}
element {
scale: 14
symbol {
name: "restaurant-s"
priority: 16864
min_distance: 10
}
caption {
primary {
height: 10
color: 4473924
offset_y: 6
}
priority: 15864
}
}
element {
scale: 15
symbol {
name: "restaurant-m"
priority: 16864
min_distance: 20
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 16
symbol {
name: "restaurant-m"
priority: 16864
min_distance: 10
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
symbol {
name: "restaurant-l"
priority: 16864
}
caption {
primary {
height: 10
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
symbol {
name: "restaurant-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
symbol {
name: "restaurant-l"
priority: 16864
}
caption {
primary {
height: 11
color: 4473924
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-school"
element {

BIN
data/drules_proto_dark.bin
View file

Binary file not shown.

224
data/drules_proto_dark.txt
View file

@ -6444,230 +6444,6 @@ cont {
}
}
}
cont {
name: "amenity-restaurant-vegan"
element {
scale: 13
symbol {
name: "restaurant-s"
priority: 16864
min_distance: 10
}
caption {
primary {
height: 10
color: 5592405
offset_y: 6
}
priority: 15864
}
}
element {
scale: 14
symbol {
name: "restaurant-s"
priority: 16864
min_distance: 10
}
caption {
primary {
height: 10
color: 5592405
offset_y: 6
}
priority: 15864
}
}
element {
scale: 15
symbol {
name: "restaurant-m"
priority: 16864
min_distance: 20
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 16
symbol {
name: "restaurant-m"
priority: 16864
min_distance: 10
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
symbol {
name: "restaurant-l"
priority: 16864
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
symbol {
name: "restaurant-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
symbol {
name: "restaurant-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-restaurant-vegetarian"
element {
scale: 13
symbol {
name: "restaurant-s"
priority: 16864
min_distance: 10
}
caption {
primary {
height: 10
color: 5592405
offset_y: 6
}
priority: 15864
}
}
element {
scale: 14
symbol {
name: "restaurant-s"
priority: 16864
min_distance: 10
}
caption {
primary {
height: 10
color: 5592405
offset_y: 6
}
priority: 15864
}
}
element {
scale: 15
symbol {
name: "restaurant-m"
priority: 16864
min_distance: 20
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 16
symbol {
name: "restaurant-m"
priority: 16864
min_distance: 10
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 17
symbol {
name: "restaurant-l"
priority: 16864
}
caption {
primary {
height: 10
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 18
symbol {
name: "restaurant-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
element {
scale: 19
symbol {
name: "restaurant-l"
priority: 16864
}
caption {
primary {
height: 11
color: 5592405
offset_y: 10
}
priority: 15864
}
}
}
cont {
name: "amenity-school"
element {

BIN
data/drules_proto_legacy.bin
View file

Binary file not shown.

116
data/drules_proto_legacy.txt
View file

@ -4860,122 +4860,6 @@ cont {
}
}
}
cont {
name: "amenity-restaurant-vegan"
element {
scale: 16
symbol {
name: "restaurant"
priority: 16000
}
}
element {
scale: 17
symbol {
name: "restaurant"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "restaurant"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "restaurant"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-restaurant-vegetarian"
element {
scale: 16
symbol {
name: "restaurant"
priority: 16000
}
}
element {
scale: 17
symbol {
name: "restaurant"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "restaurant"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "restaurant"
priority: 16003
}
caption {
primary {
height: 11
color: 4210752
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "amenity-school"
element {

6
data/mapcss-mapping.csv
View file

@ -368,7 +368,7 @@ railway|narrow_gauge|bridge;[railway=narrow_gauge][bridge?];;name;int_name;367;
noexit|motorcar;[noexit=motorcar];x;name;int_name;368;
highway|service|parking_aisle|tunnel;[highway=service][service=parking_aisle][tunnel?];x;name;int_name;369;highway|service|parking_aisle
highway|bridleway|permissive;[highway=bridleway][access=permissive];;name;int_name;370;
railway|construction;[railway=construction];name;int_name;371;
railway|construction;[railway=construction];;name;int_name;371;
highway|primary_link|junction;[highway=primary_link][junction?];x;name;int_name;372;highway|primary_link
landuse|greenhouse_horticulture;[landuse=greenhouse_horticulture];;name;int_name;373;
highway|primary_link|motorroad;[highway=primary_link][motorroad?];x;name;int_name;374;highway|primary_link
@ -461,7 +461,6 @@ railway|construction|tunnel;[railway][construction?][tunnel?];x;name;int_name;46
sport|handball;[sport=handball];;name;int_name;461;
boundary|administrative|city;[boundary=administrative][border_type=city];;name;int_name;462;
piste:type|downhill|freeride;[piste:type=downhill][piste:difficulty=freeride];;name;int_name;463;
amenity|restaurant|vegetarian;[amenity=restaurant][cuisine=vegetarian];;name;int_name;464;
communication|line|submarine;[communication=line][location=submarine];x;name;int_name;465;communication|line
piste:type|downhill|expert;[piste:type=downhill][piste:difficulty=expert];;name;int_name;466;
landuse|salt_pond;[landuse=salt_pond];;name;int_name;467;
@ -543,7 +542,6 @@ amenity|speed_trap;[amenity=speed_trap];;name;int_name;542;
highway|track|grade4|area;[highway=track][tracktype=grade4][area?];x;name;int_name;543;area:highway|track
highway|primary|area;[highway=primary][area?];x;name;int_name;544;area:highway|primary
power|line|underground;[power=line][location=underground];;name;int_name;545;
amenity|restaurant|vegan;[amenity=restaurant][cuisine=vegan];;name;int_name;546;
highway|track|construction;[highway=track][construction?];x;name;int_name;547;highway|construction
highway|minor|oneway;[highway=minor][oneway?];x;name;int_name;548;highway|unclassified
highway|bridleway|cutting;[highway=bridleway][cutting?];x;name;int_name;549;highway|bridleway
@ -956,7 +954,7 @@ shop|furniture;[shop=furniture];;name;int_name;955;
natural|grassland;[natural=grassland];;name;int_name;956;
natural|waterfall;[natural=waterfall];;name;int_name;957;
waterway|waterfall;[waterway=waterfall];;name;int_name;958;
railway|proposed;[railway=proposed];name;int_name;959;
railway|proposed;[railway=proposed];;name;int_name;959;
amenity|casino;[amenity=casino];;name;int_name;960;
amenity|brothel;[amenity=brothel];;name;int_name;961;
place|neighbourhood;[place=neighbourhood];;name;int_name;962;

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

4
data/types.txt
View file

@ -461,7 +461,7 @@ mapswithme
sport|handball
boundary|administrative|city
piste:type|downhill|freeride
amenity|restaurant|vegetarian
mapswithme
communication|line
piste:type|downhill|expert
landuse|salt_pond
@ -543,7 +543,7 @@ amenity|speed_trap
area:highway|track
area:highway|primary
power|line|underground
amenity|restaurant|vegan
mapswithme
highway|construction
highway|unclassified
highway|bridleway

5
data/visibility.txt
View file

@ -83,10 +83,7 @@ world 00000000000000000000 +
post_office 00000000000000001111 -
pub 00000000000000001111 -
recycling 00000000000000000111 -
restaurant 00000000000000001111 +
vegan 00000000000000001111 -
vegetarian 00000000000000001111 -
{}
restaurant 00000000000000001111 -
school 00000000000001111111 -
shelter 00000000000000111111 -
speed_trap 00000000000000001111 -