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

[classificator] Added some historic types.

Browse source
This commit is contained in:
vng 2014-06-16 15:54:08 +03:00 • committed by Alex Zolotarev
parent ea00c6e665
commit 6c51fe243e
8 changed files with 587 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/classificator.txt
View file

@ -311,12 +311,17 @@ world +
historic +
archaeological_site -
battlefield -
boundary_stone -
castle -
citywalls -
memorial -
monument -
museum -
ruins -
ship -
tomb -
wayside_cross -
wayside_shrine -
{}
landuse +
allotments -

BIN
data/drules_proto-bw.bin
View file

Binary file not shown.

433
data/drules_proto-bw.txt
View file

@ -4583,35 +4583,35 @@ cont {
element {
scale: 15
area {
color: 14535867
color: 13421738
priority: 1368
}
}
element {
scale: 16
area {
color: 14535867
color: 13421738
priority: 1368
}
}
element {
scale: 17
area {
color: 14535867
color: 13421738
priority: 1368
}
}
element {
scale: 18
area {
color: 14535867
color: 13421738
priority: 1368
}
}
element {
scale: 19
area {
color: 14535867
color: 13421738
priority: 1368
}
}
@ -16086,12 +16086,16 @@ cont {
element {
scale: 15
lines {
width: 3.0
color: 15658734
width: 2.0
color: 13421738
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 13421738
priority: 1027
}
path_text {
primary {
height: 10
@ -16103,12 +16107,16 @@ cont {
element {
scale: 16
lines {
width: 4.0
color: 15658734
width: 3.0
color: 13421738
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 13421738
priority: 1027
}
path_text {
primary {
height: 10
@ -16121,11 +16129,15 @@ cont {
scale: 17
lines {
width: 7.0
color: 15658734
color: 13421738
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 13421738
priority: 1027
}
path_text {
primary {
height: 10
@ -16138,11 +16150,15 @@ cont {
scale: 18
lines {
width: 9.0
color: 15658734
color: 13421738
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 13421738
priority: 1027
}
path_text {
primary {
height: 10
@ -16155,11 +16171,15 @@ cont {
scale: 19
lines {
width: 17.0
color: 15658734
color: 13421738
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 13421738
priority: 1027
}
path_text {
primary {
height: 10
@ -16174,7 +16194,7 @@ cont {
element {
scale: 15
area {
color: 15658734
color: 13421738
priority: 1027
}
path_text {
@ -16188,7 +16208,7 @@ cont {
element {
scale: 16
area {
color: 15658734
color: 13421738
priority: 1027
}
path_text {
@ -16202,7 +16222,7 @@ cont {
element {
scale: 17
area {
color: 15658734
color: 13421738
priority: 1027
}
path_text {
@ -16216,7 +16236,7 @@ cont {
element {
scale: 18
area {
color: 15658734
color: 13421738
priority: 1027
}
path_text {
@ -16230,7 +16250,7 @@ cont {
element {
scale: 19
area {
color: 15658734
color: 13421738
priority: 1027
}
path_text {
@ -16246,9 +16266,44 @@ cont {
name: "highway-pedestrian-bridge"
element {
scale: 15
lines {
width: 2.0
color: 13421738
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
}
lines {
width: 10.0
color: 16777215
priority: 1007
join: ROUNDJOIN
cap: BUTTCAP
}
lines {
width: 12.0
color: 7829367
priority: 1004
join: ROUNDJOIN
cap: BUTTCAP
}
area {
color: 13421738
priority: 1027
}
path_text {
primary {
height: 10
color: 0
}
priority: 16026
}
}
element {
scale: 16
lines {
width: 3.0
color: 15658734
color: 13421738
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16267,36 +16322,9 @@ cont {
join: ROUNDJOIN
cap: BUTTCAP
}
path_text {
primary {
height: 10
color: 0
}
priority: 16026
}
}
element {
scale: 16
lines {
width: 4.0
color: 15658734
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
}
lines {
width: 12.0
color: 16777215
priority: 1007
join: ROUNDJOIN
cap: BUTTCAP
}
lines {
width: 14.0
color: 7829367
priority: 1004
join: ROUNDJOIN
cap: BUTTCAP
area {
color: 13421738
priority: 1027
}
path_text {
primary {
@ -16310,7 +16338,7 @@ cont {
scale: 17
lines {
width: 7.0
color: 15658734
color: 13421738
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16329,6 +16357,10 @@ cont {
join: ROUNDJOIN
cap: BUTTCAP
}
area {
color: 13421738
priority: 1027
}
path_text {
primary {
height: 10
@ -16341,7 +16373,7 @@ cont {
scale: 18
lines {
width: 9.0
color: 15658734
color: 13421738
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16360,6 +16392,10 @@ cont {
join: ROUNDJOIN
cap: BUTTCAP
}
area {
color: 13421738
priority: 1027
}
path_text {
primary {
height: 10
@ -16372,7 +16408,7 @@ cont {
scale: 19
lines {
width: 17.0
color: 15658734
color: 13421738
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16391,6 +16427,10 @@ cont {
join: ROUNDJOIN
cap: BUTTCAP
}
area {
color: 13421738
priority: 1027
}
path_text {
primary {
height: 10
@ -16404,9 +16444,48 @@ cont {
name: "highway-pedestrian-tunnel"
element {
scale: 15
lines {
width: 2.0
color: 13421738
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
}
lines {
width: 10.0
color: 16777215
priority: 1007
join: ROUNDJOIN
cap: BUTTCAP
}
lines {
width: 12.0
color: 7829367
dashdot {
dd: 5.0
dd: 5.0
}
priority: 1004
join: ROUNDJOIN
cap: BUTTCAP
}
area {
color: 13421738
priority: 1027
}
path_text {
primary {
height: 10
color: 0
}
priority: 16026
}
}
element {
scale: 16
lines {
width: 3.0
color: 15658734
color: 13421738
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16429,40 +16508,9 @@ cont {
join: ROUNDJOIN
cap: BUTTCAP
}
path_text {
primary {
height: 10
color: 0
}
priority: 16026
}
}
element {
scale: 16
lines {
width: 4.0
color: 15658734
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
}
lines {
width: 12.0
color: 16777215
priority: 1007
join: ROUNDJOIN
cap: BUTTCAP
}
lines {
width: 14.0
color: 7829367
dashdot {
dd: 5.0
dd: 5.0
}
priority: 1004
join: ROUNDJOIN
cap: BUTTCAP
area {
color: 13421738
priority: 1027
}
path_text {
primary {
@ -16476,7 +16524,7 @@ cont {
scale: 17
lines {
width: 7.0
color: 15658734
color: 13421738
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16499,6 +16547,10 @@ cont {
join: ROUNDJOIN
cap: BUTTCAP
}
area {
color: 13421738
priority: 1027
}
path_text {
primary {
height: 10
@ -16511,7 +16563,7 @@ cont {
scale: 18
lines {
width: 9.0
color: 15658734
color: 13421738
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16534,6 +16586,10 @@ cont {
join: ROUNDJOIN
cap: BUTTCAP
}
area {
color: 13421738
priority: 1027
}
path_text {
primary {
height: 10
@ -16546,7 +16602,7 @@ cont {
scale: 19
lines {
width: 17.0
color: 15658734
color: 13421738
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16569,6 +16625,10 @@ cont {
join: ROUNDJOIN
cap: BUTTCAP
}
area {
color: 13421738
priority: 1027
}
path_text {
primary {
height: 10
@ -30705,6 +30765,45 @@ cont {
}
}
}
cont {
name: "historic-boundary_stone"
element {
scale: 17
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
}
cont {
name: "historic-castle"
element {
@ -30763,6 +30862,45 @@ cont {
}
}
}
cont {
name: "historic-citywalls"
element {
scale: 17
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
}
cont {
name: "historic-memorial"
element {
@ -31074,6 +31212,123 @@ cont {
}
}
}
cont {
name: "historic-tomb"
element {
scale: 17
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
}
cont {
name: "historic-wayside_cross"
element {
scale: 17
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
}
cont {
name: "historic-wayside_shrine"
element {
scale: 17
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 0
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
}
cont {
name: "landuse-basin"
element {

BIN
data/drules_proto.bin
View file

Binary file not shown.

226
data/drules_proto.txt
View file

@ -32784,6 +32784,45 @@ cont {
}
}
}
cont {
name: "historic-boundary_stone"
element {
scale: 17
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
}
cont {
name: "historic-castle"
element {
@ -32842,6 +32881,76 @@ cont {
}
}
}
cont {
name: "historic-citywalls"
element {
scale: 16
lines {
width: 0.1
color: 12303291
priority: 1917
join: ROUNDJOIN
cap: ROUNDCAP
}
}
element {
scale: 17
lines {
width: 0.1
color: 12303291
priority: 1002
join: ROUNDJOIN
cap: ROUNDCAP
}
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 18
lines {
width: 0.1
color: 12303291
priority: 1002
join: ROUNDJOIN
cap: ROUNDCAP
}
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 19
lines {
width: 0.1
color: 12303291
priority: 1002
join: ROUNDJOIN
cap: ROUNDCAP
}
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
}
cont {
name: "historic-memorial"
element {
@ -33153,6 +33262,123 @@ cont {
}
}
}
cont {
name: "historic-tomb"
element {
scale: 17
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
}
cont {
name: "historic-wayside_cross"
element {
scale: 17
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
}
cont {
name: "historic-wayside_shrine"
element {
scale: 17
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
}
cont {
name: "landuse-allotments"
element {

5
data/mapcss-mapping.csv
View file

@ -961,3 +961,8 @@ amenity|casino;[amenity=casino];;name;int_name;960;
amenity|brothel;[amenity=brothel];;name;int_name;961;
place|neighbourhood;[place=neighbourhood];;name;int_name;962;
place|isolated_dwelling;[place=isolated_dwelling];;name;int_name;963;
historic|wayside_cross;[historic=wayside_cross];;name;int_name;964;
historic|wayside_shrine;[historic=wayside_shrine];;name;int_name;965;
historic|boundary_stone;[historic=boundary_stone];;name;int_name;966;
historic|citywalls;[historic=citywalls];;name;int_name;967;
historic|tomb;[historic=tomb];;name;int_name;968;

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

3
data/styles/normal.mapcss
View file

@ -3379,7 +3379,8 @@ node|z17-[tourism=information][information=guidepost]
{
icon-image: information-guidepost.svg;
}
line|z16-[barrier=fence]
line|z16-[barrier=fence],
line|z16-[historic=citywalls]
{
color: #b0b0b0;
width: .1;

5
data/types.txt
View file

@ -961,3 +961,8 @@ amenity|casino
amenity|brothel
place|neighbourhood
place|isolated_dwelling
historic|wayside_cross
historic|wayside_shrine
historic|boundary_stone
historic|citywalls
historic|tomb