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

Merge pull request #1037 from kshalnev/fixed_rivers

Browse source 
[styles] Fixed rivers + minor fixes
This commit is contained in:
Alexander Matveenko 2015-12-17 18:17:33 +03:00
commit 21a0f4e83d
6 changed files with 29 additions and 428 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/drules_proto_clear.bin
View file

Binary file not shown.

214
data/drules_proto_clear.txt
View file

@ -46529,6 +46529,10 @@ cont {
scale: 13
caption {
primary {
height: 12
color: 8355711
}
secondary {
height: 10
color: 8355711
offset_y: 20
@ -46640,6 +46644,10 @@ cont {
scale: 13
caption {
primary {
height: 12
color: 8355711
}
secondary {
height: 10
color: 8355711
offset_y: 20
@ -61356,212 +61364,6 @@ cont {
}
}
}
cont {
name: "waterway-river-tunnel"
element {
scale: 10
lines {
width: 1.0
color: 3584191
priority: -15800
join: BEVELJOIN
cap: BUTTCAP
}
area {
color: 9163744
priority: -15041
}
}
element {
scale: 11
lines {
width: 1.2
color: 3584191
priority: -15800
join: BEVELJOIN
cap: BUTTCAP
}
area {
color: 9163744
priority: -15041
}
path_text {
primary {
height: 10
color: 4495803
}
priority: 16959
}
}
element {
scale: 12
lines {
width: 1.2
color: 3584191
priority: -15800
join: BEVELJOIN
cap: BUTTCAP
}
area {
color: 9163744
priority: -15041
}
path_text {
primary {
height: 10
color: 4495803
}
priority: 16959
}
}
element {
scale: 13
lines {
width: 1.6
color: 3584191
priority: -15800
join: ROUNDJOIN
cap: BUTTCAP
}
area {
color: 9163744
priority: -15041
}
path_text {
primary {
height: 10
color: 4495803
}
priority: 16959
}
}
element {
scale: 14
lines {
width: 1.8
color: 3584191
priority: -15800
join: ROUNDJOIN
cap: BUTTCAP
}
area {
color: 9163744
priority: -15041
}
path_text {
primary {
height: 10
color: 4495803
}
priority: 16959
}
}
element {
scale: 15
lines {
width: 2.2
color: 3584191
priority: -15800
join: ROUNDJOIN
cap: BUTTCAP
}
area {
color: 9163744
priority: -15041
}
path_text {
primary {
height: 12
color: 4495803
}
priority: 16959
}
}
element {
scale: 16
lines {
width: 2.2
color: 3584191
priority: -15800
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 9163744
priority: -15041
}
path_text {
primary {
height: 12
color: 4495803
}
priority: 16959
}
}
element {
scale: 17
lines {
width: 2.2
color: 3584191
priority: -15800
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 9163744
priority: -15041
}
path_text {
primary {
height: 12
color: 4495803
}
priority: 16959
}
}
element {
scale: 18
lines {
width: 2.2
color: 3584191
priority: -15800
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 9163744
priority: -15041
}
path_text {
primary {
height: 12
color: 4495803
}
priority: 16959
}
}
element {
scale: 19
lines {
width: 2.2
color: 3584191
priority: -15800
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 9163744
priority: -15041
}
path_text {
primary {
height: 12
color: 4495803
}
priority: 16959
}
}
}
cont {
name: "waterway-riverbank"
element {

BIN
data/drules_proto_dark.bin
View file

Binary file not shown.

214
data/drules_proto_dark.txt
View file

@ -46529,6 +46529,10 @@ cont {
scale: 13
caption {
primary {
height: 12
color: 5592405
}
secondary {
height: 10
color: 5592405
offset_y: 20
@ -46640,6 +46644,10 @@ cont {
scale: 13
caption {
primary {
height: 12
color: 5592405
}
secondary {
height: 10
color: 5592405
offset_y: 20
@ -61356,212 +61364,6 @@ cont {
}
}
}
cont {
name: "waterway-river-tunnel"
element {
scale: 10
lines {
width: 1.0
color: 401446
priority: -15800
join: BEVELJOIN
cap: BUTTCAP
}
area {
color: 8738
priority: -15041
}
}
element {
scale: 11
lines {
width: 1.2
color: 401446
priority: -15800
join: BEVELJOIN
cap: BUTTCAP
}
area {
color: 8738
priority: -15041
}
path_text {
primary {
height: 10
color: 17510
}
priority: 16959
}
}
element {
scale: 12
lines {
width: 1.2
color: 401446
priority: -15800
join: BEVELJOIN
cap: BUTTCAP
}
area {
color: 8738
priority: -15041
}
path_text {
primary {
height: 10
color: 17510
}
priority: 16959
}
}
element {
scale: 13
lines {
width: 1.6
color: 401446
priority: -15800
join: ROUNDJOIN
cap: BUTTCAP
}
area {
color: 8738
priority: -15041
}
path_text {
primary {
height: 10
color: 17510
}
priority: 16959
}
}
element {
scale: 14
lines {
width: 1.8
color: 401446
priority: -15800
join: ROUNDJOIN
cap: BUTTCAP
}
area {
color: 8738
priority: -15041
}
path_text {
primary {
height: 10
color: 17510
}
priority: 16959
}
}
element {
scale: 15
lines {
width: 2.2
color: 401446
priority: -15800
join: ROUNDJOIN
cap: BUTTCAP
}
area {
color: 8738
priority: -15041
}
path_text {
primary {
height: 12
color: 17510
}
priority: 16959
}
}
element {
scale: 16
lines {
width: 2.2
color: 401446
priority: -15800
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 8738
priority: -15041
}
path_text {
primary {
height: 12
color: 17510
}
priority: 16959
}
}
element {
scale: 17
lines {
width: 2.2
color: 401446
priority: -15800
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 8738
priority: -15041
}
path_text {
primary {
height: 12
color: 17510
}
priority: 16959
}
}
element {
scale: 18
lines {
width: 2.2
color: 401446
priority: -15800
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 8738
priority: -15041
}
path_text {
primary {
height: 12
color: 17510
}
priority: 16959
}
}
element {
scale: 19
lines {
width: 2.2
color: 401446
priority: -15800
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 8738
priority: -15041
}
path_text {
primary {
height: 12
color: 17510
}
priority: 16959
}
}
}
cont {
name: "waterway-riverbank"
element {

14
data/styles/clear/include/labels.mapcss
View file

@ -1289,8 +1289,8 @@ node|z13-14[place=suburb]::int_name
}
/* SMALL LOCALITIES */
node|z14-[place=locality],
node|z14-[place=neighbourhood],
node|z13-[place=locality],
node|z13-[place=neighbourhood],
node|z14-[place=farm],
node|z14-[place=isolated_dwelling],
node|z8-9[place=region],
@ -1551,7 +1551,7 @@ line[waterway] {
z-index:10000;
}
line|z11-[waterway=river] {
line|z11-[waterway=river][!tunnel?] {
text: name;
font-size: 10;
text-color: @water_label;
@ -1572,7 +1572,7 @@ line|z11-[waterway=riverbank] {
}
line|z13-[waterway=riverbank],
line|z13-[waterway=river] {
line|z13-[waterway=river][!tunnel?] {
text: name;
font-size: 10;
text-color: @water_label;
@ -1592,7 +1592,7 @@ line|z13-[waterway=canal] {
text-halo-radius: 0;
z-index: 10000;
}
line|z15-[waterway=river] {
line|z15-[waterway=river][!tunnel?] {
text: name;
font-size: 12;
text-color: @water_label;
@ -1622,7 +1622,7 @@ line|z15-[waterway=canal] {
text-halo-radius: 0;
z-index: 10000;
}
line|z17-[waterway=river] {
line|z17-[waterway=river][!tunnel?] {
text: name;
font-size: 12;
text-color: @water_label;
@ -1652,7 +1652,7 @@ line|z17-[waterway=canal] {
text-halo-radius: 0;
z-index: 10000;
}
line|z18-[waterway=river] {
line|z18-[waterway=river][!tunnel?] {
text: name;
font-size: 12;
text-color: @water_label;

15
data/styles/clear/include/natural.mapcss
View file

@ -62,7 +62,7 @@ area|z0-[natural=salt_pond],
area|z0-[landuse=salt_pond],
area|z0-[waterway=dock],
area|z0-[waterway=riverbank],
area|z10-[waterway=river],
area|z10-[waterway=river][!tunnel?],
area|z10-[natural=bay],
{
fill-color: @water;
@ -82,7 +82,7 @@ area|z11-19[natural=marsh] {
/* rivers */
line|z10[waterway=river],
line|z10[waterway=river][!tunnel?],
line|z10[waterway=riverbank] {
width: 1;
opacity: 1;
@ -91,11 +91,8 @@ line|z10[waterway=riverbank] {
-x-me-line-priority: -15800;
}
line|z10-19[waterway=river][tunnel?],
{
}
line|z11-12[waterway=river],
line|z11-12[waterway=river][!tunnel?],
line|z11-12[waterway=riverbank] {
width: 1.2;
opacity: 1;
@ -124,7 +121,7 @@ line|z13[waterway=stream][intermittent=yes] {
-x-me-line-priority: -15800;
}
line|z13[waterway=river] {
line|z13[waterway=river][!tunnel?] {
width: 1.6;
opacity: 1;
color: @river;
@ -158,7 +155,7 @@ line|z14[waterway=stream][intermittent=yes] {
-x-me-line-priority: -15800;
}
line|z14[waterway=river] {
line|z14[waterway=river][!tunnel?]{
width: 1.8;
opacity: 1;
color: @river;
@ -191,7 +188,7 @@ line|z15-[waterway=stream][intermittent=yes] {
z-index: 49;
-x-me-line-priority: -15800;
}
line|z15-[waterway=river] {
line|z15-[waterway=river][!tunnel?] {
width: 2.2;
color: @river;
z-index: 50;