[cairo-commit] roadster/data layers.xml,1.17,1.18

[Keith Packard]

Committed by: keithp

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

Modified Files:
	layers.xml 
Log Message:
2005-05-26  Keith Packard  <keithp at keithp.com>

	reviewed by: <delete if not using a buddy>

	* data/layers.xml:
	Label more stuff.
	* src/map.c: (map_draw):
	Use cairo by default (it is reasonably usable this way)
	* src/map_draw_cairo.c: (map_draw_cairo),
	(map_draw_cairo_background), (map_draw_cairo_layer_road_labels),
	(map_draw_cairo_layer_polygon_labels),
	(map_draw_cairo_layer_roads), (map_draw_cairo_layer_polygons),
	(map_draw_cairo_layer_points),
	(map_draw_cairo_road_label_one_segment),
	(map_draw_cairo_road_label), (map_draw_cairo_polygon_label),
	(map_draw_cairo_locationselection_outline),
	(map_draw_cairo_locationselection):
	API updates to 0.5 snapshot.


Index: layers.xml
===================================================================
RCS file: /cvs/cairo/roadster/data/layers.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- layers.xml	23 Apr 2005 18:13:39 -0000	1.17
+++ layers.xml	26 May 2005 20:05:36 -0000	1.18
@@ -5,6 +5,8 @@
 
 <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="8" value="12.0" />
@@ -26,6 +28,8 @@
 	</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" />
@@ -45,6 +49,7 @@
 		<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" />
@@ -83,6 +88,7 @@
 		<property name="cap-style" value="round" />
 	</sublayer>
 	<sublayer>
+		<property name="width" level="1" value="1.0" />
 		<property name="width" level="3" value="2.5" />
 		<property name="width" level="4" value="3.1" />
 		<property name="width" level="5" value="6.5" />
@@ -97,7 +103,8 @@
 	</sublayer>
 	<label>
 		<property name="color" value="#00000000" />
-		<property name="font-size" level="6" value="12" />
+		<property name="font-size" level="1" value="8" />
+		<property name="font-size" level="6" value="10" />
 		<property name="font-size" level="7" value="12" />
 		<property name="font-size" level="8" value="16" />
 		<property name="font-size" level="9" value="18" />
@@ -144,6 +151,7 @@
 		<property name="cap-style" value="butt" />
 	</sublayer>
 	<sublayer>
+		<property name="width" level="1" value="1.0" />
 		<property name="width" level="3" value="2.0" />
 		<property name="width" level="4" value="8.5" />
 		<property name="width" level="5" value="10.0" />
@@ -158,7 +166,7 @@
 	</sublayer>
 	<label>
 		<property name="color" value="#00000000" />
-		<property name="font-size" level="6" value="6" />
+		<property name="font-size" level="1" value="6" />
 		<property name="font-size" level="7" value="8" />
 		<property name="font-size" level="8" value="10" />
 		<property name="font-size" level="9" value="16" />
@@ -225,7 +233,10 @@
 	</sublayer>
 	<label>
 		<property name="color" value="#338833FF" />
-		<property name="font-size" level="6" value="10" />
+		<property name="font-size" level="2" value="6" />
+		<property name="font-size" level="5" value="6" />
+		<property name="font-size" level="6" value="8" />
+		<property name="font-size" level="7" value="10" />
 		<property name="font-size" level="8" value="12" />
 		<property name="font-size" level="10" value="14" />
 		<property name="bold" value="yes" />
@@ -235,6 +246,7 @@
 
 <layer name="rivers">
 	<sublayer>
+		<property name="width" level="4" value="1.0" />
 		<property name="width" level="5" value="5.0" />
 		<property name="width" level="6" value="5.0" />
 		<property name="width" level="7" value="5.0" />
@@ -260,8 +272,9 @@
 
 <layer name="lakes">
 	<sublayer>
-		<property name="width" level="3" value="2.0" />
 		<property name="color" value="#777777FF" />
+		<property name="width" level="1" value="1.0" />
+		<property name="width" level="3" value="2.0" />
 		<property name="join-style" value="miter" />
 		<property name="cap-style" value="butt" />
 	</sublayer>
@@ -273,6 +286,7 @@
 	</sublayer>
 	<label>
 		<property name="color" value="#5250F8FF" />
+		<property name="font-size" level="2" value="5" />
 		<property name="font-size" level="6" value="10" />
 		<property name="font-size" level="8" value="12" />
 		<property name="font-size" level="10" value="14" />
@@ -300,4 +314,3 @@
 </layer>
 
 </roadster-layers>
-