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

[classificator] Added new shop-* types.

Browse source
This commit is contained in:
vng 2015-02-04 18:47:14 +03:00 • committed by Alex Zolotarev
parent ef1dba3a46
commit 7fd7b95f35
9 changed files with 270 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/categories.txt
View file

@ -215,7 +215,7 @@ da:2bager|bageri|butik
tr:3fırın|mağaza
sv:3bageri|butik
shop|shop-convenience|shop-mall|shop-doityourself|shop-florist|shop-butcher
shop|shop-convenience|shop-mall|shop-doityourself|shop-florist|shop-butcher|shop-furniture|shop-alcohol|shop-books|shop-shoes|shop-electronics|shop-hardware|shop-jewelry|shop-optician|shop-gift|shop-mobile_phone|shop-beauty|shop-greengrocer|shop-chemist|shop-garden_centre|shop-sports
en:2shop
ru:2магазин
uk:2магазин|крамниця

2
data/classificator.txt
View file

@ -645,6 +645,7 @@ world +
shop +
alcohol -
bakery -
beauty -
beverages -
bicycle -
books -
@ -672,6 +673,7 @@ world +
mobile_phone -
optician -
shoes -
sports -
supermarket -
toys -
{}

BIN
data/drules_proto-bw.bin
View file

Binary file not shown.

128
data/drules_proto-bw.txt
View file

@ -47400,6 +47400,13 @@ cont {
}
cont {
name: "shop-alcohol"
element {
scale: 16
symbol {
name: "supermarket"
priority: 16000
}
}
element {
scale: 17
symbol {
@ -47507,6 +47514,57 @@ cont {
}
}
}
cont {
name: "shop-beauty"
element {
scale: 17
symbol {
name: "supermarket"
priority: 16002
}
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 18
symbol {
name: "supermarket"
priority: 16002
}
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 19
symbol {
name: "supermarket"
priority: 16002
}
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
}
cont {
name: "shop-beverages"
element {
@ -47548,13 +47606,6 @@ cont {
}
cont {
name: "shop-bicycle"
element {
scale: 16
symbol {
name: "supermarket"
priority: 16000
}
}
element {
scale: 17
symbol {
@ -48685,6 +48736,10 @@ cont {
name: "shop-mobile_phone"
element {
scale: 17
symbol {
name: "supermarket"
priority: 16002
}
caption {
primary {
height: 11
@ -48697,6 +48752,10 @@ cont {
}
element {
scale: 18
symbol {
name: "supermarket"
priority: 16002
}
caption {
primary {
height: 11
@ -48709,6 +48768,10 @@ cont {
}
element {
scale: 19
symbol {
name: "supermarket"
priority: 16002
}
caption {
primary {
height: 11
@ -48810,6 +48873,57 @@ cont {
}
}
}
cont {
name: "shop-sports"
element {
scale: 17
symbol {
name: "supermarket"
priority: 16002
}
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 18
symbol {
name: "supermarket"
priority: 16002
}
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 19
symbol {
name: "supermarket"
priority: 16002
}
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
}
cont {
name: "shop-supermarket"
element {

BIN
data/drules_proto.bin
View file

Binary file not shown.

128
data/drules_proto.txt
View file

@ -56754,6 +56754,13 @@ cont {
}
cont {
name: "shop-alcohol"
element {
scale: 16
symbol {
name: "supermarket"
priority: 16000
}
}
element {
scale: 17
symbol {
@ -56861,6 +56868,57 @@ cont {
}
}
}
cont {
name: "shop-beauty"
element {
scale: 17
symbol {
name: "supermarket"
priority: 16003
}
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "supermarket"
priority: 16003
}
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "supermarket"
priority: 16003
}
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "shop-beverages"
element {
@ -56902,13 +56960,6 @@ cont {
}
cont {
name: "shop-bicycle"
element {
scale: 16
symbol {
name: "supermarket"
priority: 16000
}
}
element {
scale: 17
symbol {
@ -58039,6 +58090,10 @@ cont {
name: "shop-mobile_phone"
element {
scale: 17
symbol {
name: "supermarket"
priority: 16003
}
caption {
primary {
height: 11
@ -58051,6 +58106,10 @@ cont {
}
element {
scale: 18
symbol {
name: "supermarket"
priority: 16003
}
caption {
primary {
height: 11
@ -58063,6 +58122,10 @@ cont {
}
element {
scale: 19
symbol {
name: "supermarket"
priority: 16003
}
caption {
primary {
height: 11
@ -58164,6 +58227,57 @@ cont {
}
}
}
cont {
name: "shop-sports"
element {
scale: 17
symbol {
name: "supermarket"
priority: 16003
}
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 18
symbol {
name: "supermarket"
priority: 16003
}
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
element {
scale: 19
symbol {
name: "supermarket"
priority: 16003
}
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15003
}
}
}
cont {
name: "shop-supermarket"
element {

2
data/mapcss-mapping.csv
View file

@ -989,3 +989,5 @@ hwtag|private;[hwtag=private];;name;int_name;988;
route|ferry|motorcar;[route=ferry];;name;int_name;989;
junction|roundabout;[junction=roundabout];;name;int_name;990;
highway|speed_camera;[highway=speed_camera];;name;int_name;991;
shop|beauty;[shop=beauty];;name;int_name;992;
shop|sports;[shop=sports];;name;int_name;993;

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

33
data/styles/include/base_shop.mapcss
View file

@ -35,30 +35,39 @@ node|z16-[shop=bakery]
area|z16-[shop=convenience],
area|z16-[shop=mall],
area|z17-[shop=florist],
area|z17-[shop=butcher],
area|z16-[shop=doityourself],
area|z16-[shop=supermarket],
area|z16-[shop=bicycle],
area|z17-[shop=alcohol],
area|z16-[shop=department_store],
area|z16-[shop=furniture],
area|z16-[shop=alcohol],
area|z17-[shop=bicycle],
area|z17-[shop=florist],
area|z17-[shop=butcher],
area|z17-[shop=books],
area|z17-[shop=electronics],
area|z17-[shop=shoes],
area|z16-[shop=department_store],
area|z17-[shop=sports],
area|z17-[shop=beauty],
area|z17-[shop=mobile_phone],
node|z16-[shop=convenience],
node|z16-[shop=mall],
node|z16-[shop=doityourself],
node|z16-[shop=supermarket],
node|z16-[shop=department_store],
node|z16-[shop=furniture],
node|z16-[shop=alcohol],
node|z17-[shop=bicycle],
node|z17-[shop=florist],
node|z17-[shop=butcher],
node|z17-[shop=doityourself],
node|z16-[shop=supermarket],
node|z16-[shop=bicycle],
node|z17-[shop=alcohol],
node|z17-[shop=books],
node|z17-[shop=electronics],
node|z17-[shop=shoes],
node|z16-[shop=department_store],
area|z16-[shop=furniture],
node|z16-[shop=furniture]
node|z17-[shop=sports],
node|z17-[shop=beauty],
node|z17-[shop=mobile_phone],
{
icon-image: supermarket.svg;
}

2
data/types.txt
View file

@ -989,3 +989,5 @@ hwtag|private
route|ferry|motorcar
junction|roundabout
highway|speed_camera
shop|beauty
shop|sports