[cairo-commit] roadster/data layers.xml,1.19,1.20

[Ian McIntosh]

Committed by: ian

Update of /cvs/cairo/roadster/data
In directory gabe:/tmp/cvs-serv11436/data

Modified Files:
	layers.xml 
Log Message:
        * src/db.c: Remove incorrect 'UNIQUE' attribute on Name index in RoadName table.
        * src/scenemanager.c: Add 'on screen' as additional (optional) criteria for allowing drawing.
        * src/map_draw_cairo.c: Update to new scenemanager API.  Add new dual-line smart area labeler.
	* src/util.c: Function util_split_words_onto_two_lines() is now used.
        * data/layers.xml: Various style tweaks.  It's fun.
        * src/map.c: Style tweaks.


Index: layers.xml
===================================================================
RCS file: /cvs/cairo/roadster/data/layers.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- layers.xml	28 Aug 2005 22:23:14 -0000	1.19
+++ layers.xml	31 Aug 2005 08:37:53 -0000	1.20
@@ -5,31 +5,27 @@
 
 <layer name="minor-roads">
 	<sublayer>
-		<property name="width" level="4" value="0.5" />
-		<property name="width" level="5" value="1.0" />
-		<property name="width" level="6" value="3.0" />
-		<property name="width" level="7" value="5.0" />
+		<property name="width" level="6" value="4.0" />
+		<property name="width" level="7" value="7.0" />
 		<property name="width" level="8" value="12.0" />
 		<property name="width" level="9" value="17.0" />
 		<property name="width" level="10" value="35.0" />
 		<property name="color" value="#a0a0a0ff" />
 		<property name="join-style" value="miter" />
-		<property name="cap-style" value="butt" />
+		<property name="cap-style" value="round" />
 	</sublayer>
 	<sublayer>
-		<property name="width" level="6" value="1.0" />
-		<property name="width" level="7" value="3.0" />
+		<property name="width" level="6" value="2.0" />
+		<property name="width" level="7" value="5.0" />
 		<property name="width" level="8" value="10.0" />
 		<property name="width" level="9" value="15.0" />
 		<property name="width" level="10" value="33.0" />
 		<property name="color" value="#fffbffff" />
 		<property name="join-style" value="miter" />
-		<property name="cap-style" value="butt" />
+		<property name="cap-style" value="round" />
 	</sublayer>
 	<label>
 		<property name="color" value="#FF000000" />
-		<property name="font-size" level="6" value="7" />
-		<property name="font-size" level="8" value="9" />
 		<property name="font-size" level="8" value="11" />
 		<property name="font-size" level="9" value="13" />
 		<property name="font-size" level="10" value="24" />
@@ -38,7 +34,6 @@
 
 <layer name="major-roads">
 	<sublayer>
-		<property name="width" level="5" value="8.0" />
 		<property name="width" level="6" value="9.0" />
 		<property name="width" level="7" value="13.0" />
 		<property name="width" level="8" value="15.0" />
@@ -49,10 +44,6 @@
 		<property name="cap-style" value="round" />
 	</sublayer>
 	<sublayer>
-		<property name="width" level="2" value="1.0" />
-		<property name="width" level="3" value="1.8" />
-		<property name="width" level="4" value="2.5" />
-		<property name="width" level="5" value="6.0" />
 		<property name="width" level="6" value="7.0" />
 		<property name="width" level="7" value="11.0" />
 		<property name="width" level="8" value="13.0" />
@@ -64,7 +55,7 @@
 	</sublayer>
 	<label>
 		<property name="color" value="#00000000" />
-		<property name="font-size" level="6" value="12" />
+		<property name="font-size" level="6" value="10" />
 		<property name="font-size" level="7" value="12" />
 		<property name="font-size" level="8" value="12" />
 		<property name="font-size" level="9" value="20" />
@@ -195,26 +186,30 @@
 
 <layer name="railroads">
 	<sublayer>
-		<property name="width" level="6" value="0.5" />
-		<property name="width" level="7" value="2.2" />
-		<property name="color" value="#808080ff" />
+		<property name="width" level="6" value="3.0" />
+		<property name="width" level="7" value="4.0" />
+		<property name="width" level="9" value="6.0" />
+		<property name="color" value="#A0A0A0ff" />
 		<property name="join-style" value="miter" />
 		<property name="cap-style" value="butt" />
 	</sublayer>
 	<sublayer>
 		<property name="width" level="6" value="1.0" />
-		<property name="width" level="7" value="4.0" />
+		<property name="width" level="7" value="2.0" />
 		<property name="width" level="9" value="4.0" />
-		<property name="width" level="10" value="7.0" />
-		<property name="color" value="#404040ff" />
+		<property name="color" value="#ffffffff" />
 		<property name="join-style" value="miter" />
 		<property name="cap-style" value="butt" />
 		<property name="dash-style" value="1" />
 	</sublayer>
 	<label>
 		<property name="color" value="#00000000" />
-		<property name="font-size" level="7" value="11" />
-		<property name="halo" level="7" value="2" />
+		<property name="font-size" level="6" value="10" />
+		<property name="font-size" level="7" value="12" />
+		<property name="font-size" level="8" value="12" />
+		<property name="font-size" level="9" value="16" />
+		<property name="halo" value="3" />
+		<property name="bold" value="no" />
 	</label>
 </layer>
 
@@ -232,18 +227,18 @@
 		<property name="cap-style" value="butt" />
 	</sublayer>
 	<label>
-		<property name="color" value="#222222FF" />
+		<property name="color" value="#303030FF" />
 		<property name="font-size" level="6" value="11" />
 		<property name="font-size" level="7" value="12" />
 		<property name="font-size" level="8" value="13" />
 		<property name="bold" value="no" />
-		<property name="halo" value="2" />
+		<property name="halo" value="4" />
 	</label>
 </layer>
 
 <layer name="rivers">
 	<sublayer>
-		<property name="width" level="6" value="3.0" />
+		<property name="width" level="6" value="4.0" />
 		<property name="width" level="7" value="5.0" />
 		<property name="width" level="8" value="5.0" />
 		<property name="width" level="9" value="8.0" />
@@ -253,7 +248,7 @@
 		<property name="cap-style" value="round" />
 	</sublayer>
 	<sublayer>
-		<property name="width" level="6" value="1.0" />
+		<property name="width" level="6" value="2.0" />
 		<property name="width" level="7" value="3.0" />
 		<property name="width" level="8" value="3.0" />
 		<property name="width" level="9" value="6.0" />
@@ -282,9 +277,9 @@
 		<property name="color" value="#222222FF" />
 		<property name="font-size" level="6" value="11" />
 		<property name="font-size" level="7" value="12" />
-		<property name="font-size" level="8" value="13" />
+		<property name="font-size" level="8" value="14" />
 		<property name="bold" value="no" />
-		<property name="halo" value="2" />
+		<property name="halo" value="3" />
 	</label>
 </layer>
 
@@ -296,12 +291,12 @@
 		<property name="cap-style" value="butt" />
 	</sublayer>
 	<label>
-		<property name="color" value="#222222FF" />
+		<property name="color" value="#303030FF" />
 		<property name="font-size" level="6" value="11" />
 		<property name="font-size" level="7" value="12" />
 		<property name="font-size" level="8" value="13" />
 		<property name="bold" value="no" />
-		<property name="halo" value="2" />
+		<property name="halo" value="3" />
 	</label>
 </layer>