Permalink
Browse files

Moved around some old data sources

git-svn-id: svn+ssh://studio.stamen.com/var/svn/fortiusone/trunk/deliver/cartography@191 9fabccc5-ae4d-4b29-8469-45b2b2873c65
  • Loading branch information...
1 parent d8277b1 commit 136d23facbf80953ccb3eb4419a87b2b6ee0bb1a migurski committed Nov 21, 2010
View
@@ -161,13 +161,13 @@ acetate-foreground-17.png: style-foreground.xml
-style-combined.xml: style-combined.mml world-naturalearth-lowzooms.mss world-osm-midzooms.mss city-area-colors.mss city-line-colors.mss city-line-widths.mss city-road-labels.mss
+style-combined.xml: style-combined.mml world-naturalearth-lowzooms.mss world-osm-midzooms.mss city-area-colors.mss city-line-colors.mss city-line-widths.mss city-road-labels.mss city-place-labels.mss
cascadenik-compile.py style-combined.mml > style-combined.xml
-style-background.xml: style-background.mml world-naturalearth-lowzooms.mss world-osm-midzooms.mss city-area-colors.mss city-line-colors.mss city-line-widths.mss city-road-labels.mss
+style-background.xml: style-background.mml world-naturalearth-lowzooms.mss world-osm-midzooms.mss city-area-colors.mss city-line-colors.mss city-line-widths.mss city-road-labels.mss city-place-labels.mss
cascadenik-compile.py style-background.mml > style-background.xml
-style-foreground.xml: style-foreground.mml world-naturalearth-lowzooms.mss world-osm-midzooms.mss city-area-colors.mss city-line-colors.mss city-line-widths.mss city-road-labels.mss
+style-foreground.xml: style-foreground.mml world-naturalearth-lowzooms.mss world-osm-midzooms.mss city-area-colors.mss city-line-colors.mss city-line-widths.mss city-road-labels.mss city-place-labels.mss
cascadenik-compile.py style-foreground.mml > style-foreground.xml
clean:
@@ -1,7 +1,11 @@
Map { map-bgcolor: #b1b8b8; }
#water-bodies[zoom>=9] { polygon-fill: #b1b8b8; }
-#processed-coast-background[zoom>=9] { polygon-fill: #e4e3db; }
+#processed-coast-background[zoom>=9],
+#null-island-background[zoom>=12]
+{
+ polygon-fill: #e4e3db;
+}
#green-areas[zoom>=9][kind=forest],
#green-areas[zoom>=10][kind=park],
View
@@ -0,0 +1,16 @@
+#null-island-label[zoom>=9] name
+{
+ text-face-name: 'Arial Bold';
+ text-wrap-width: 80;
+ text-size: 18;
+ text-fill: #b4b4b4;
+ text-halo-radius: 1;
+ text-halo-fill: #e4e3db;
+}
+
+#null-island-label[zoom=12] name { text-dy: 3; }
+#null-island-label[zoom=13] name { text-dy: 6; }
+#null-island-label[zoom=14] name { text-dy: 9; }
+#null-island-label[zoom=15] name { text-dy: 12; }
+#null-island-label[zoom=16] name { text-dy: 15; }
+#null-island-label[zoom=17] name { text-dy: 25; }
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
File renamed without changes.
View
Binary file not shown.
View
Binary file not shown.
View
@@ -317,13 +317,6 @@
</Datasource>
</Layer>
- <Layer status="off" id="country-labels-110m" srs="&epsg900913;">
- <Datasource>
- <Parameter name="type">shape</Parameter>
- <Parameter name="file">shp/admin_0_countries_110m-points</Parameter>
- </Datasource>
- </Layer>
-
<Layer status="off" id="marine-labels-110m" srs="&epsg900913;">
<Datasource>
<Parameter name="type">postgis</Parameter>
@@ -380,6 +373,7 @@
<Stylesheet src="city-line-colors.mss"/>
<Stylesheet src="city-line-widths.mss"/>
<Stylesheet src="city-road-labels.mss"/>
+ <Stylesheet src="city-place-labels.mss"/>
<Layer id="processed-coast-background" srs="&epsg900913;">
<Datasource>
@@ -393,6 +387,12 @@
<Parameter name="extent">&epsg900913_extent;</Parameter>
</Datasource>
</Layer>
+ <Layer id="null-island-background" srs="&epsg900913;">
+ <Datasource>
+ <Parameter name="type">shape</Parameter>
+ <Parameter name="file">shp/null</Parameter>
+ </Datasource>
+ </Layer>
<Layer id="civic-areas" srs="&epsg900913;">
<Datasource>
@@ -1115,4 +1115,11 @@
</Datasource>
</Layer>
+ <Layer status="off" id="null-island-label" srs="&epsg900913;">
+ <Datasource>
+ <Parameter name="type">shape</Parameter>
+ <Parameter name="file">shp/null</Parameter>
+ </Datasource>
+ </Layer>
+
</Map>
View
@@ -317,13 +317,6 @@
</Datasource>
</Layer>
- <Layer status="off" id="country-labels-110m" srs="&epsg900913;">
- <Datasource>
- <Parameter name="type">shape</Parameter>
- <Parameter name="file">shp/admin_0_countries_110m-points</Parameter>
- </Datasource>
- </Layer>
-
<Layer id="marine-labels-110m" srs="&epsg900913;">
<Datasource>
<Parameter name="type">postgis</Parameter>
@@ -380,6 +373,7 @@
<Stylesheet src="city-line-colors.mss"/>
<Stylesheet src="city-line-widths.mss"/>
<Stylesheet src="city-road-labels.mss"/>
+ <Stylesheet src="city-place-labels.mss"/>
<Layer id="processed-coast-background" srs="&epsg900913;">
<Datasource>
@@ -393,6 +387,12 @@
<Parameter name="extent">&epsg900913_extent;</Parameter>
</Datasource>
</Layer>
+ <Layer id="null-island-background" srs="&epsg900913;">
+ <Datasource>
+ <Parameter name="type">shape</Parameter>
+ <Parameter name="file">shp/null</Parameter>
+ </Datasource>
+ </Layer>
<Layer id="civic-areas" srs="&epsg900913;">
<Datasource>
@@ -1115,4 +1115,11 @@
</Datasource>
</Layer>
+ <Layer id="null-island-label" srs="&epsg900913;">
+ <Datasource>
+ <Parameter name="type">shape</Parameter>
+ <Parameter name="file">shp/null</Parameter>
+ </Datasource>
+ </Layer>
+
</Map>
View
@@ -317,13 +317,6 @@
</Datasource>
</Layer>
- <Layer status="off" id="country-labels-110m" srs="&epsg900913;">
- <Datasource>
- <Parameter name="type">shape</Parameter>
- <Parameter name="file">shp/admin_0_countries_110m-points</Parameter>
- </Datasource>
- </Layer>
-
<Layer id="marine-labels-110m" srs="&epsg900913;">
<Datasource>
<Parameter name="type">postgis</Parameter>
@@ -380,6 +373,7 @@
<Stylesheet src="city-line-colors.mss"/>
<Stylesheet src="city-line-widths.mss"/>
<Stylesheet src="city-road-labels.mss"/>
+ <Stylesheet src="city-place-labels.mss"/>
<Stylesheet><![CDATA[
@@ -427,6 +421,12 @@
<Parameter name="extent">&epsg900913_extent;</Parameter>
</Datasource>
</Layer>
+ <Layer status="off" id="null-island-background" srs="&epsg900913;">
+ <Datasource>
+ <Parameter name="type">shape</Parameter>
+ <Parameter name="file">shp/null</Parameter>
+ </Datasource>
+ </Layer>
<Layer status="off" id="civic-areas" srs="&epsg900913;">
<Datasource>
@@ -1149,4 +1149,11 @@
</Datasource>
</Layer>
+ <Layer id="null-island-label" srs="&epsg900913;">
+ <Datasource>
+ <Parameter name="type">shape</Parameter>
+ <Parameter name="file">shp/null</Parameter>
+ </Datasource>
+ </Layer>
+
</Map>

0 comments on commit 136d23f

Please sign in to comment.