Port to openmaptiles

master
Lukas Martinelli 2017-01-04 18:15:22 +01:00
rodzic 735e34d642
commit 2beec1ebb5
6 zmienionych plików z 1159 dodań i 1645 usunięć

Plik binarny nie jest wyświetlany.

Przed

Szerokość:  |  Wysokość:  |  Rozmiar: 296 KiB

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 288 KiB

Wyświetl plik

@ -57,7 +57,7 @@
} }
} }
#water_label::ships { #water_name::ships {
marker-width:0; marker-width:0;
marker-line-width:0; marker-line-width:0;
marker-fill:rgba(0,0,0,0); marker-fill:rgba(0,0,0,0);

Wyświetl plik

@ -1,4 +1,4 @@
#country_label[zoom>=3] { #place[class='country'][zoom>=3] {
text-name: @name_arrr; text-name: @name_arrr;
text-face-name: 'Quintessential Regular'; text-face-name: 'Quintessential Regular';
text-wrap-width: 100; text-wrap-width: 100;
@ -7,27 +7,27 @@
text-size: 14; text-size: 14;
text-halo-fill:fadeout(@land,40); text-halo-fill:fadeout(@land,40);
text-halo-radius:1.5; text-halo-radius:1.5;
[zoom>=3][scalerank=1], [zoom>=3][rank=1],
[zoom>=4][scalerank=2], [zoom>=4][rank=2],
[zoom>=5][scalerank=3], [zoom>=5][rank=3],
[zoom>=6][scalerank>3] { [zoom>=6][rank>3] {
text-size: 18; text-size: 18;
} }
[zoom>=4][scalerank=1], [zoom>=4][rank=1],
[zoom>=5][scalerank=2], [zoom>=5][rank=2],
[zoom>=6][scalerank=3], [zoom>=6][rank=3],
[zoom>=7][scalerank>3] { [zoom>=7][rank>3] {
text-size: 24; text-size: 24;
} }
} }
#poi_label[zoom>=7][type!='Aerodrome'][type!='Rail Station'] { #poi[zoom>=7][subclass!='aerodrome'][subclass!='railstation'] {
[zoom<14][localrank<=1], [zoom<14][rank<=3],
[zoom>=14][scalerank=1][localrank<=1], [zoom>=14][rank<=5],
[zoom>=15][scalerank<=2][localrank<=1], [zoom>=15][rank<=10],
[zoom>=16][scalerank<=3][localrank<=1], [zoom>=16][rank<=15],
[zoom>=17][localrank<=3] { [zoom>=17][rank<=20] {
text-name: @name; text-name: '[name]';
text-face-name: 'Gothic Ultra OT Regular'; text-face-name: 'Gothic Ultra OT Regular';
text-line-spacing:-5; text-line-spacing:-5;
text-fill: #431; text-fill: #431;
@ -39,12 +39,13 @@
} }
} }
#water_label { #water_name {
[zoom<=13], // automatic area filtering @ low zooms [zoom<=13], // automatic area filtering @ low zooms
[zoom>=14][area>500000], [zoom>=14][area>500000],
[zoom>=16][area>10000], [zoom>=16][area>10000],
[zoom>=17] { [zoom>=17] {
text-name: @name_arrr; text-placement: line;
text-name: '[name]';
text-face-name: 'Gothic Ultra OT Regular'; text-face-name: 'Gothic Ultra OT Regular';
text-line-spacing:-5; text-line-spacing:-5;
text-fill: #245; text-fill: #245;
@ -54,7 +55,7 @@
} }
} }
#place_label[type='city'][zoom<=14][localrank<=2] { #place[class='city'][zoom<=14][rank<=6] {
text-name: @name_arrr; text-name: @name_arrr;
text-face-name: 'Quintessential Regular'; text-face-name: 'Quintessential Regular';
text-fill: #421; text-fill: #421;
@ -62,38 +63,38 @@
text-halo-radius: 3; text-halo-radius: 3;
[zoom>=3] { [zoom>=3] {
text-size:10; text-size:10;
[scalerank>=0][scalerank<=1] { text-size: 16; } [rank>=0][rank<=2] { text-size: 16; }
[scalerank>=2][scalerank<=3] { text-size: 14; } [rank>=3][rank<=5] { text-size: 14; }
[scalerank>=4] { text-size: 12; } [rank>=6] { text-size: 12; }
} }
[zoom>=5] { [zoom>=5] {
text-size:12; text-size:12;
[scalerank>=0][scalerank<=1] { text-size: 18; } [rank>=0][rank<=1] { text-size: 18; }
[scalerank>=2][scalerank<=3] { text-size: 17; } [rank>=2][rank<=3] { text-size: 17; }
[scalerank>=4] { text-size: 14; } [rank>=4] { text-size: 14; }
} }
[zoom>=6] { [zoom>=6] {
text-size:14; text-size:14;
[scalerank>=0][scalerank<=1] { text-size: 20; } [rank>=0][rank<=1] { text-size: 20; }
[scalerank>=2][scalerank<=3] { text-size: 18; } [rank>=2][rank<=3] { text-size: 18; }
[scalerank>=4] { text-size: 16; } [rank>=4] { text-size: 16; }
} }
[zoom>=8] { [zoom>=8] {
text-size: 16; text-size: 16;
[scalerank>=0][scalerank<=1] { text-size: 28; } [rank>=0][rank<=1] { text-size: 28; }
[scalerank>=2][scalerank<=3] { text-size: 24; } [rank>=2][rank<=3] { text-size: 24; }
[scalerank>=4] { text-size: 20; } [rank>=4] { text-size: 20; }
} }
[zoom>=10] { [zoom>=10] {
text-size: 22; text-size: 22;
[scalerank>=0][scalerank<=1] { text-size: 32; } [rank>=0][rank<=1] { text-size: 32; }
[scalerank>=2][scalerank<=3] { text-size: 28; } [rank>=2][rank<=3] { text-size: 28; }
[scalerank>=4] { text-size: 26; } [rank>=4] { text-size: 26; }
} }
[zoom>=12] { [zoom>=12] {
text-size: 28; text-size: 28;
[scalerank<=3] { text-size: 36; } [rank<=3] { text-size: 36; }
[scalerank>=4] { text-size: 32; } [rank>=4] { text-size: 32; }
} }
[zoom>=13] { [zoom>=13] {
text-size: 36; text-size: 36;
@ -103,7 +104,7 @@
} }
} }
#place_label[type='town'] { #place[class='town'] {
text-name: @name_arrr; text-name: @name_arrr;
text-face-name: 'Quintessential Regular'; text-face-name: 'Quintessential Regular';
text-fill: #421; text-fill: #421;
@ -118,8 +119,8 @@
[zoom>=13] { text-size: 28; } [zoom>=13] { text-size: 28; }
} }
#place_label[type='village'], #place[class='village'],
#place_label[type='suburb'] { #place[class='suburb'] {
text-name: @name_arrr; text-name: @name_arrr;
text-face-name: 'Quintessential Regular'; text-face-name: 'Quintessential Regular';
text-fill: #532; text-fill: #532;
@ -134,8 +135,8 @@
[zoom>=15] { text-size: 28; } [zoom>=15] { text-size: 28; }
} }
#place_label[type='hamlet'], #place[class='hamlet'],
#place_label[type='neighbourhood'] { #place[class='neighbourhood'] {
text-name: @name; text-name: @name;
text-face-name: 'Quintessential Regular'; text-face-name: 'Quintessential Regular';
text-fill: #754; text-fill: #754;
@ -152,10 +153,10 @@
[zoom>=17] { text-size: 28; } [zoom>=17] { text-size: 28; }
} }
#road_label[zoom>=12][class='motorway'], #transportation_name[zoom>=12][class='motorway'],
#road_label[zoom>=14][class='main'], #transportation_name[zoom>=14][class=~'trunk|primary|secondary|tertiary'],
#road_label[zoom>=16] { #transportation_name[zoom>=16] {
text-name: @name; text-name: '[name]';
text-face-name: 'Gothic Ultra OT Regular'; text-face-name: 'Gothic Ultra OT Regular';
text-fill: #654; text-fill: #654;
text-placement: line; text-placement: line;
@ -163,51 +164,4 @@
text-halo-fill: @land; text-halo-fill: @land;
text-halo-radius: 2; text-halo-radius: 2;
text-size: 18; text-size: 18;
} }
@mts: 1.5;
#marine_label::text[zoom>=2]["mapnik::geometry_type"=1],
#marine_label::text[zoom>=2]["mapnik::geometry_type"=2] {
text-name: @name_arrr;
text-face-name: 'Mutlu Ornamental';
text-fill: #244;
text-size: 10*@mts;
["mapnik::geometry_type"=1] {
text-placement: point;
text-wrap-width: 30;
text-line-spacing: -10;
}
["mapnik::geometry_type"=2] {
text-placement: line;
}
[labelrank=1][zoom>=2],
[labelrank=2][zoom>=3],
[labelrank=3][zoom>=4],
[labelrank=4][zoom>=5],
[labelrank=5][zoom>=6],
[labelrank=6][zoom>=7] {
text-size: 13*@mts;
text-character-spacing: 1;
}
[labelrank=1][zoom>=3],
[labelrank=2][zoom>=4],
[labelrank=3][zoom>=5],
[labelrank=4][zoom>=6],
[labelrank=5][zoom>=7],
[labelrank=6][zoom>=8] {
text-size: 16*@mts;
text-character-spacing: 2;
}
[labelrank=1][zoom>=4],
[labelrank=2][zoom>=5],
[labelrank=3][zoom>=6] {
text-size: 20*@mts;
text-character-spacing: 4;
}
[labelrank=1][zoom>=5],
[labelrank=2][zoom>=6],
[labelrank=3][zoom>=7] {
text-size: 24*@mts;
text-character-spacing: 8;
}
}

Plik diff jest za duży Load Diff

Wyświetl plik

@ -18,7 +18,7 @@ layers: null
maxzoom: 21 maxzoom: 21
minzoom: 0 minzoom: 0
name: Pirates Return name: Pirates Return
source: "mapbox:///mapbox.mapbox-streets-v6" source: "http://openmaptiles.org/cdn.json"
styles: styles:
- style.mss - style.mss
- labels.mss - labels.mss

Wyświetl plik

@ -15,7 +15,7 @@ Map {
// Political boundaries // // Political boundaries //
#admin[maritime=0][zoom>=3] { #boundary[zoom>=3] {
line-join: round; line-join: round;
line-color: #478; line-color: #478;
comp-op:multiply; comp-op:multiply;
@ -31,7 +31,7 @@ Map {
} }
} }
// States / Provices / Subregions // States / Provices / Subregions
[admin_level>=3] { [admin_level>=3][admin_level<=6] {
line-width: 0.4; line-width: 0.4;
line-dasharray: 10,3,3,3; line-dasharray: 10,3,3,3;
[zoom>=6] { line-width: 1; } [zoom>=6] { line-width: 1; }
@ -73,15 +73,15 @@ Map {
#waterway { #waterway {
comp-op:multiply; comp-op:multiply;
[type='river'], [class='river'],
[type='canal'] { [class='canal'] {
line-color: @water; line-color: @water;
line-width: 0.5; line-width: 0.5;
[zoom>=12] { line-width: 1; } [zoom>=12] { line-width: 1; }
[zoom>=14] { line-width: 2; } [zoom>=14] { line-width: 2; }
[zoom>=16] { line-width: 3; } [zoom>=16] { line-width: 3; }
} }
[type='stream'] { [class='stream'] {
line-color: @water; line-color: @water;
line-width: 0.5; line-width: 0.5;
[zoom>=14] { line-width: 1; } [zoom>=14] { line-width: 1; }
@ -92,6 +92,32 @@ Map {
// Landuse areas // // Landuse areas //
#landcover {
::wood[class='wood'] {
line-color:#C3CFB4;
line-opacity:0.33;
line-width:3;
line-join:round;
polygon-pattern-file:url(img/forest.png);
polygon-pattern-alignment:global;
comp-op:multiply;
opacity:0.5;
}
}
#park {
::glow {
comp-op:multiply;
line-color:#ddb;
line-width:2;
line-join:round;
}
::main[zoom>=0] {
comp-op:multiply;
polygon-pattern-file:url(img/park.png);
polygon-pattern-alignment:global;
}
}
#landuse { #landuse {
::glow { ::glow {
@ -115,16 +141,7 @@ Map {
polygon-opacity:0.5; polygon-opacity:0.5;
} }
} }
::wood[class='wood'] {
line-color:#C3CFB4;
line-opacity:0.33;
line-width:3;
line-join:round;
polygon-pattern-file:url(img/forest.png);
polygon-pattern-alignment:global;
comp-op:multiply;
opacity:0.5;
}
} }
@ -146,29 +163,30 @@ Map {
#tunnel { opacity: 0.5; } #tunnel { opacity: 0.5; }
#road, #transportation {
#tunnel,
#bridge {
['mapnik::geometry_type'=2] { ['mapnik::geometry_type'=2] {
line-width: 1; line-width: 1;
line-color:#edc; line-color:#edc;
line-comp-op:multiply; line-comp-op:multiply;
[class='motorway'], [class='motorway'],
[class='main'], [class='trunk'],
[class='motorway_link']{ [class='primary'],
[class='secondary'],
[class='tertiary'],
[class='motorway'][ramp=1]{
line-color:#dba; line-color:#dba;
[zoom>=10] { line-width: 1; } [zoom>=10] { line-width: 1; }
[zoom>=12] { line-width: 2; } [zoom>=12] { line-width: 2; }
[zoom>=14] { line-width: 3; } [zoom>=14] { line-width: 3; }
[zoom>=16] { line-width: 5; } [zoom>=16] { line-width: 5; }
} }
[class='street'], [class='minor'],
[class='street_limited'] { [class='service'] {
[zoom>=13] { line-width: 1.4; } [zoom>=13] { line-width: 1.4; }
[zoom>=14] { line-width: 2; } [zoom>=14] { line-width: 2; }
[zoom>=16] { line-width: 3; } [zoom>=16] { line-width: 3; }
} }
[class='street_limited'] { line-dasharray: 4,1; } [class='service'] { line-dasharray: 4,1; }
[class='path'] { line-dasharray: 3,2; } [class='path'] { line-dasharray: 3,2; }
} }
} }