Skip to content

continents #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xmlinc wants to merge 4 commits into
base: master
Choose a base branch
from
Open

continents #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5881e3
added place=continent
xmlinc Mar 20, 2023
c8d27f5
details fix
xmlinc Mar 20, 2023
ee09742
Update points.mapcss
xmlinc Mar 20, 2023
7c17c3f
Update points.mapcss
xmlinc Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions Default.style/points.mapcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,16 @@ node,area {
font-stroke-width: 1pt;
font-stroke-color: @color_label_stroke;

node[place=continent] {
|z1-2 {
text: eval(locTag('name'));
text-color: @color_name_text;
details-enabled: 0;
}
}

[place=country] {
|z2-8 {
|z3-8 {
text: eval(locTag('name'));
text-color: @color_name_text;
font-size: 16;
Expand All @@ -20,11 +28,14 @@ node,area {
text-priority: 10;
text-big-padding: true;
}
|z2-4 {
|z3-4 {
font-size:12;
font-weight: normal;
text-big-padding: false;
}
|z2-3 {
font-size:10;
}
}

[boundary=administrative] {
Expand Down Expand Up @@ -130,7 +141,7 @@ node,area {
text: eval(locTag('name'));
text-color: @color_water_text;
text-priority: 5;
font-size:16;
font-size:12;
font-stroke-width:2pt;
font-stroke-color: @color_water;
}
Expand Down Expand Up @@ -258,15 +269,15 @@ node,area {
node|z17-[entrance][!indoor] {
icon-image: "poi_circle_small.svg";
icon-tint: @color_entrance_text;

text-priority: -5;
details-enabled: 0;

icon-scale: 0.7;
[entrance=main] {
icon-scale: 0.85;
}

Copy link
Collaborator

@molind molind Mar 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Что это за пустые строчки?

Copy link
Author

@xmlinc xmlinc Mar 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

мой редактор автоматически удаляет при сохранении файла спрятанные в коде пустые spaces & tabs, видимо там и присутсвовали такие ненужные символы, сорян

|z18-{
icon-image: "poi_entrance.svg";
icon-scale: 0.8;
Expand All @@ -280,7 +291,7 @@ node,area {
font-size: 9;
details-enabled: 1;
}

Copy link
Collaborator

@molind molind Mar 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

И тут

[ref] {
text: eval( tag('ref') );
text-color: @color_entrance_text;
Expand Down Expand Up @@ -734,7 +745,7 @@ node,area {
text-color: @color_text_offices;
}
}

Copy link
Collaborator

@molind molind Mar 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

И дальше..

|z16-(
[amenity=college],
[amenity=school],
Expand Down Expand Up @@ -1055,15 +1066,15 @@ node,area {
node|z16-[highway=bus_stop] {
icon-image:"poi_bus.svg";
icon-tint: @color_icon_transport;

text: eval(locTag('name'));
text-color: @color_text_transport;
}

node|z17-[railway=tram_stop] {
icon-image:"poi_tram.svg";
icon-tint: @color_icon_transport;

text: eval(locTag('name'));
text-color: @color_text_transport;
}
Expand All @@ -1085,7 +1096,7 @@ node,area {
text-priority: 7;
}
}

|z14-[railway=station][transport=subway],
|z14-[railway=station][station=subway],
|z15-[railway=station],
Expand Down Expand Up @@ -1121,10 +1132,10 @@ node,area {
font-size: 8;
text-color: @color_label_text;
font-stroke-color: @color_footway_area;

details-enabled: 0;
text-priority: 1;

|z16-{
font-size: 9;
}
Expand Down Expand Up @@ -1156,15 +1167,15 @@ node,area {
icon-image:"poi_gate.svg";
icon-scale: 0.75;
icon-tint: @color_icon_tint;

details-enabled: 0;
text-priority: -1;
}

node|z17-[barrier=lift_gate] {
icon-image:"poi_lift_gate.svg";
icon-tint: @color_icon_tint;

details-enabled: 0;
text-priority: -1;
}
Expand Down
16 changes: 8 additions & 8 deletions Default.style/polygons.mapcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ area {

[boundary=administrative] {
// country boundaries
[admin_level=2] {
|z3-[admin_level=2] {
z-index: 4;
width: eval( zlinear(13, 1pt,2pt,3pt ));
color: @color_boundary_country;
Expand Down Expand Up @@ -90,7 +90,7 @@ area {
fill-color: @color_landuse_commercial;
}
}

// generalized buildings
|z11-12[landuse=residential]{
z-index: -14;
Expand Down Expand Up @@ -119,7 +119,7 @@ area {
z-index: -14;
fill-color: @color_sand;
}

[landuse=quarry] {
z-index: -14;
fill-color: @color_quarry;
Expand All @@ -139,7 +139,7 @@ area {
fill-color: @color_nature_reserve;
}
}

@if SubStyle != Car
|z10-[leisure=nature_reserve] {
color: @color_national_park;
Expand All @@ -150,7 +150,7 @@ area {
width: 2pt;
}
@endif

|z13-{
// заросли кустов
[natural=scrub] {
Expand Down Expand Up @@ -251,9 +251,9 @@ area {
fill-color: @color_landuse_parking;
}
}

// -10

|z9-[natural=glacier] {
fill-color: @color_glacier;
z-index:-10;
Expand All @@ -268,7 +268,7 @@ area {
fill-color: @color_water;
}
}

[natural=wetland] {
|z9-12 {
fill-color: @color_wetland;
Expand Down