Skip to content

Commit a7d37bc

Browse files
g12ng12n
committed
removed unused styles and moved park labels to labels.mss
Signed-off-by: mge <m@g12n.de>
1 parent f5a84c2 commit a7d37bc

File tree

5 files changed

+83
-118
lines changed

5 files changed

+83
-118
lines changed

‎CardboardMap.tm2/.thumb.png

1.96 KB
Loading

‎CardboardMap.tm2/labels.mss

+16
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,19 @@
7070
[zoom>=16] { text-size: 16; }
7171
}
7272
}
73+
74+
#area_label {
75+
[class='park'] {
76+
[zoom<=13], // automatic area filtering @ low zooms
77+
[zoom>=14][area>500000],
78+
[zoom>=16][area>10000],
79+
[zoom>=17] {
80+
text-name: @name;
81+
text-face-name: 'Source Sans Pro Italic';
82+
text-fill: darken(@park, 50%);
83+
text-size: 13;
84+
text-wrap-width: 100;
85+
text-wrap-before: true;
86+
}
87+
}
88+
}

‎CardboardMap.tm2/project.xml

+35-32
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE Map[]>
3-
<Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="#dddddd" background-image="textures/paper-texture.jpg" buffer-size="20" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
3+
<Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="#dddddd" background-image="textures/paper-texture.jpg" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
44

55
<Parameters>
66
<Parameter name="attribution"><![CDATA[Map data © OpenStreetMap contributors]]></Parameter>
77
<Parameter name="bounds">-180,-85.0511,180,85.0511</Parameter>
8-
<Parameter name="center">7.03125,50.94458443495011,5</Parameter>
8+
<Parameter name="center">-4.5263671875,53.91081008725409,6</Parameter>
99
<Parameter name="description"><![CDATA[Tilemill 2 Map Style based on a Carboard look]]></Parameter>
1010
<Parameter name="format">png8:m=h</Parameter>
1111
<Parameter name="maxzoom">22</Parameter>
@@ -16,11 +16,6 @@
1616
</Parameters>
1717

1818

19-
<Style name="landuse-maske" filter-mode="first" image-filters="agg-stack-blur(20,20)">
20-
<Rule>
21-
<Filter>([class] = 'park')</Filter>
22-
</Rule>
23-
</Style>
2419
<Style name="landuse-texture" filter-mode="first">
2520
<Rule>
2621
<Filter>([class] = 'park')</Filter>
@@ -29,8 +24,7 @@
2924
</Style>
3025
<Layer name="landuse"
3126
srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
32-
<StyleName>landuse-texture</StyleName>
33-
<StyleName>landuse-maske</StyleName> </Layer>
27+
<StyleName>landuse-texture</StyleName> </Layer>
3428

3529
<Style name="waterway" filter-mode="first">
3630
<Rule>
@@ -104,7 +98,7 @@
10498
srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
10599
<StyleName>waterway</StyleName> </Layer>
106100

107-
<Style name="water-shadow" filter-mode="first" image-filters="agg-stack-blur(10,10)" comp-op="screen">
101+
<Style name="water-shadow" filter-mode="first" image-filters="agg-stack-blur(20,20)" comp-op="screen">
108102
<Rule>
109103
<PolygonSymbolizer fill="#ffffff" fill-opacity="0.7" />
110104
</Rule>
@@ -143,10 +137,15 @@
143137
srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
144138
</Layer>
145139

146-
<Style name="tunnel-inset" filter-mode="first" image-filters="agg-stack-blur(1,1)">
140+
<Style name="tunnel-inset" filter-mode="first" image-filters="agg-stack-blur(0,0),agg-stack-blur(1,1)">
147141
<Rule>
142+
<MinScaleDenominator>12500000</MinScaleDenominator>
143+
<LineSymbolizer stroke-width="0.4" stroke="#ffffff" offset="0" geometry-transform="translate(2, 1)" />
144+
</Rule>
145+
<Rule>
146+
<MaxScaleDenominator>12500000</MaxScaleDenominator>
148147
<MinScaleDenominator>25000</MinScaleDenominator>
149-
<LineSymbolizer stroke-width="0.7" stroke="#ffffff" offset="0" geometry-transform="translate(2, 1)" />
148+
<LineSymbolizer stroke-width="0.6" stroke="#ffffff" offset="0" geometry-transform="translate(2, 1)" />
150149
</Rule>
151150
<Rule>
152151
<MaxScaleDenominator>25000</MaxScaleDenominator>
@@ -188,58 +187,58 @@
188187
</Rule>
189188
<Rule>
190189
<MaxScaleDenominator>12500</MaxScaleDenominator>
191-
<Filter>([class] = 'motorway')</Filter>
190+
<Filter>([class] = 'main')</Filter>
192191
<LineSymbolizer stroke-width="5" stroke="#000000" simplify="1" smooth="1" />
193192
</Rule>
194193
<Rule>
195194
<MaxScaleDenominator>50000</MaxScaleDenominator>
196195
<MinScaleDenominator>12500</MinScaleDenominator>
197-
<Filter>([class] = 'motorway')</Filter>
196+
<Filter>([class] = 'main')</Filter>
198197
<LineSymbolizer stroke-width="3" stroke="#000000" simplify="1" smooth="1" />
199198
</Rule>
200199
<Rule>
201200
<MaxScaleDenominator>200000</MaxScaleDenominator>
202201
<MinScaleDenominator>50000</MinScaleDenominator>
203-
<Filter>([class] = 'motorway')</Filter>
202+
<Filter>([class] = 'main')</Filter>
204203
<LineSymbolizer stroke-width="2" stroke="#000000" simplify="1" smooth="1" />
205204
</Rule>
206205
<Rule>
207206
<MaxScaleDenominator>750000</MaxScaleDenominator>
208207
<MinScaleDenominator>200000</MinScaleDenominator>
209-
<Filter>([class] = 'motorway')</Filter>
208+
<Filter>([class] = 'main')</Filter>
210209
<LineSymbolizer stroke-width="1" stroke="#000000" simplify="1" smooth="1" />
211210
</Rule>
212211
<Rule>
213212
<MinScaleDenominator>750000</MinScaleDenominator>
214-
<Filter>([class] = 'motorway')</Filter>
213+
<Filter>([class] = 'main')</Filter>
215214
<LineSymbolizer stroke="#000000" stroke-width="1" simplify="1" smooth="1" />
216215
</Rule>
217216
<Rule>
218217
<MaxScaleDenominator>12500</MaxScaleDenominator>
219-
<Filter>([class] = 'main')</Filter>
218+
<Filter>([class] = 'motorway')</Filter>
220219
<LineSymbolizer stroke-width="5" stroke="#000000" simplify="1" smooth="1" />
221220
</Rule>
222221
<Rule>
223222
<MaxScaleDenominator>50000</MaxScaleDenominator>
224223
<MinScaleDenominator>12500</MinScaleDenominator>
225-
<Filter>([class] = 'main')</Filter>
224+
<Filter>([class] = 'motorway')</Filter>
226225
<LineSymbolizer stroke-width="3" stroke="#000000" simplify="1" smooth="1" />
227226
</Rule>
228227
<Rule>
229228
<MaxScaleDenominator>200000</MaxScaleDenominator>
230229
<MinScaleDenominator>50000</MinScaleDenominator>
231-
<Filter>([class] = 'main')</Filter>
230+
<Filter>([class] = 'motorway')</Filter>
232231
<LineSymbolizer stroke-width="2" stroke="#000000" simplify="1" smooth="1" />
233232
</Rule>
234233
<Rule>
235234
<MaxScaleDenominator>750000</MaxScaleDenominator>
236235
<MinScaleDenominator>200000</MinScaleDenominator>
237-
<Filter>([class] = 'main')</Filter>
236+
<Filter>([class] = 'motorway')</Filter>
238237
<LineSymbolizer stroke-width="1" stroke="#000000" simplify="1" smooth="1" />
239238
</Rule>
240239
<Rule>
241240
<MinScaleDenominator>750000</MinScaleDenominator>
242-
<Filter>([class] = 'main')</Filter>
241+
<Filter>([class] = 'motorway')</Filter>
243242
<LineSymbolizer stroke="#000000" stroke-width="1" simplify="1" smooth="1" />
244243
</Rule>
245244
<Rule>
@@ -251,10 +250,15 @@
251250
<StyleName>tunnel</StyleName>
252251
<StyleName>tunnel-inset</StyleName> </Layer>
253252

254-
<Style name="road-inset" filter-mode="first" image-filters="agg-stack-blur(1,1)">
253+
<Style name="road-inset" filter-mode="first" image-filters="agg-stack-blur(0,0),agg-stack-blur(1,1)">
255254
<Rule>
255+
<MinScaleDenominator>12500000</MinScaleDenominator>
256+
<LineSymbolizer stroke-width="0.4" stroke="#ffffff" offset="0" geometry-transform="translate(2, 1)" />
257+
</Rule>
258+
<Rule>
259+
<MaxScaleDenominator>12500000</MaxScaleDenominator>
256260
<MinScaleDenominator>25000</MinScaleDenominator>
257-
<LineSymbolizer stroke-width="0.7" stroke="#ffffff" offset="0" geometry-transform="translate(2, 1)" />
261+
<LineSymbolizer stroke-width="0.6" stroke="#ffffff" offset="0" geometry-transform="translate(2, 1)" />
258262
</Rule>
259263
<Rule>
260264
<MaxScaleDenominator>25000</MaxScaleDenominator>
@@ -359,10 +363,15 @@
359363
<StyleName>road</StyleName>
360364
<StyleName>road-inset</StyleName> </Layer>
361365

362-
<Style name="bridge-inset" filter-mode="first" image-filters="agg-stack-blur(1,1)">
366+
<Style name="bridge-inset" filter-mode="first" image-filters="agg-stack-blur(0,0),agg-stack-blur(1,1)">
363367
<Rule>
368+
<MinScaleDenominator>12500000</MinScaleDenominator>
369+
<LineSymbolizer stroke-width="0.4" stroke="#ffffff" offset="0" geometry-transform="translate(2, 1)" />
370+
</Rule>
371+
<Rule>
372+
<MaxScaleDenominator>12500000</MaxScaleDenominator>
364373
<MinScaleDenominator>25000</MinScaleDenominator>
365-
<LineSymbolizer stroke-width="0.7" stroke="#ffffff" offset="0" geometry-transform="translate(2, 1)" />
374+
<LineSymbolizer stroke-width="0.6" stroke="#ffffff" offset="0" geometry-transform="translate(2, 1)" />
366375
</Rule>
367376
<Rule>
368377
<MaxScaleDenominator>25000</MaxScaleDenominator>
@@ -681,14 +690,8 @@
681690
</Layer>
682691

683692
<Style name="area_label" filter-mode="first">
684-
<Rule>
685-
<MaxScaleDenominator>12500</MaxScaleDenominator>
686-
<Filter>([class] = 'park') and ([area] &gt; 500000)</Filter>
687-
<TextSymbolizer face-name="Source Sans Pro Italic" fill="#2f8c2f" size="13" wrap-width="100" wrap-before="true" ><![CDATA[[name_en]]]></TextSymbolizer>
688-
</Rule>
689693
<Rule>
690694
<MaxScaleDenominator>50000</MaxScaleDenominator>
691-
<MinScaleDenominator>12500</MinScaleDenominator>
692695
<Filter>([class] = 'park') and ([area] &gt; 500000)</Filter>
693696
<TextSymbolizer face-name="Source Sans Pro Italic" fill="#2f8c2f" size="13" wrap-width="100" wrap-before="true" ><![CDATA[[name_en]]]></TextSymbolizer>
694697
</Rule>

‎CardboardMap.tm2/project.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ bounds:
88
- 180
99
- 85.0511
1010
center:
11-
- 7.03125
12-
- 50.94458443495011
13-
- 5
11+
- -4.5263671875
12+
- 53.91081008725409
13+
- 6
1414
description: Tilemill 2 Map Style based on a Carboard look
1515
format: "png8:m=h"
1616
interactivity_layer: ''
1717
maxzoom: 22
1818
minzoom: 0
19-
mtime: 1375990864418
19+
mtime: 1375998649857
2020
name: Cardboard Map
2121
scale: 1
2222
source: "mapbox:///mapbox.mapbox-streets-v3"

0 commit comments

Comments
 (0)