[cairo-commit]
roadster/data Makefile.am, 1.1, 1.2 layers.xml, NONE, 1.1
Nathan Fredrickson
commit at pdx.freedesktop.org
Wed Mar 2 22:45:11 PST 2005
- Previous message: [cairo-commit] roadster ChangeLog,1.30,1.31 configure.ac,1.9,1.10
- Next message: [cairo-commit] roadster/src layers.c, 1.7, 1.8 layers.h, 1.3,
1.4 main.c, 1.8, 1.9 map.c, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: nrf
Update of /cvs/cairo/roadster/data
In directory gabe:/tmp/cvs-serv562/data
Modified Files:
Makefile.am
Added Files:
layers.xml
Log Message:
* data/Makefile.am:
* configure.ac: Add dependency on libxml-2.0.
* data/layers.xml: Map layer styles defined in XML.
* src/main.c:
* src/map.c:
* src/layers.h:
* src/layers.c: Load map layer styles from an XML file.
Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/roadster/data/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am 23 Feb 2005 18:29:58 -0000 1.1
+++ Makefile.am 3 Mar 2005 06:45:09 -0000 1.2
@@ -3,9 +3,7 @@
NULL =
gladedir = $(pkgdatadir)
-glade_DATA = \
- roadster.glade \
- $(NULL)
+glade_DATA = roadster.glade
DESKTOP_IN_FILES= roadster.desktop.in
DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in=.desktop)
@@ -13,10 +11,14 @@
desktopdir = $(datadir)/applications
desktop_DATA = $(DESKTOP_FILES)
+styledir = $(pkgdatadir)
+style_DATA = layers.xml
+
install-data-local:
EXTRA_DIST = \
$(glade_DATA) \
+ $(style_DATA) \
$(DESKTOP_IN_FILES) \
$(NULL)
--- NEW FILE: layers.xml ---
<?xml version="1.0" standalone="no"?>
<!DOCTYPE roadster-layers SYSTEM "http://xxx/roadster-1.0.dtd">
<roadster-layers>
<layer name="minor-roads">
<sublayer>
<property name="width" level="5" value="1.0" />
<property name="width" level="7" value="5.0" />
<property name="width" level="8" value="12.0" />
<property name="width" level="9" value="18.0" />
<property name="width" level="10" value="36.0" />
<property name="color" value="#a99f9dff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="round" />
</sublayer>
<sublayer>
<property name="width" level="7" value="3.5" />
<property name="width" level="8" value="10.0" />
<property name="width" level="9" value="16.0" />
<property name="width" level="10" value="32.0" />
<property name="color" value="#fffbffff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="round" />
</sublayer>
<label>
<property name="color" value="#00000000" />
<property name="font-size" level="8" value="10" />
<property name="font-size" level="9" value="14" />
<property name="font-size" level="10" value="32" />
</label>
</layer>
<layer name="major-roads">
<sublayer>
<property name="width" level="7" value="12.0" />
<property name="width" level="8" value="17.0" />
<property name="width" level="9" value="24.0" />
<property name="width" level="10" value="36.0" />
<property name="color" value="#ada28cff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="round" />
</sublayer>
<sublayer>
<property name="width" level="3" value="1.8" />
<property name="width" level="4" value="2.5" />
<property name="width" level="5" value="3.3" />
<property name="width" level="6" value="6.0" />
<property name="width" level="7" value="10.0" />
<property name="width" level="8" value="14.5" />
<property name="width" level="9" value="22.0" />
<property name="width" level="10" value="32.5" />
<property name="color" value="#fffb73ff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="round" />
</sublayer>
<label>
<property name="color" value="#00000000" />
<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="9" value="20" />
<property name="font-size" level="10" value="34" />
<property name="bold" level="9" value="yes" />
</label>
</layer>
<layer name="minor-highways">
<sublayer>
<property name="width" level="3" value="4.0" />
<property name="width" level="4" value="5.0" />
<property name="width" level="5" value="8.0" />
<property name="width" level="6" value="9.0" />
<property name="width" level="7" value="17.0" />
<property name="width" level="8" value="22.0" />
<property name="width" level="9" value="28.0" />
<property name="width" level="10" value="36.0" />
<property name="color" value="#ad8e21ff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="round" />
</sublayer>
<sublayer>
<property name="width" level="3" value="2.5" />
<property name="width" level="4" value="3.1" />
<property name="width" level="5" value="6.5" />
<property name="width" level="6" value="7.0" />
<property name="width" level="7" value="15.0" />
<property name="width" level="8" value="19.5" />
<property name="width" level="9" value="25.0" />
<property name="width" level="10" value="33.0" />
<property name="color" value="#f7df4aff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="round" />
</sublayer>
<label>
<property name="color" value="#00000000" />
<property name="font-size" level="6" value="6" />
<property name="font-size" level="7" value="12" />
<property name="font-size" level="8" value="16" />
<property name="font-size" level="9" value="18" />
<property name="font-size" level="10" value="26" />
<property name="bold" level="7" value="yes" />
</label>
</layer>
<layer name="minor-highway-ramps">
<sublayer>
<property name="width" level="7" value="3.0" />
<property name="width" level="8" value="5.0" />
<property name="width" level="9" value="8.0" />
<property name="width" level="10" value="10.0" />
<property name="color" value="#ad8e21ff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="round" />
</sublayer>
<sublayer>
<property name="width" level="6" value="1.0" />
<property name="width" level="7" value="1.5" />
<property name="width" level="8" value="3.5" />
<property name="width" level="9" value="6.0" />
<property name="width" level="10" value="8.0" />
<property name="color" value="#f7df4aff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="round" />
</sublayer>
</layer>
<layer name="major-highways">
<sublayer>
<property name="width" level="3" value="4.0" />
<property name="width" level="4" value="10.0" />
<property name="width" level="5" value="12.0" />
<property name="width" level="6" value="16.0" />
<property name="width" level="7" value="22.0" />
<property name="width" level="8" value="28.0" />
<property name="width" level="9" value="34.0" />
<property name="width" level="10" value="38.0" />
<property name="color" value="#ada28cff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="butt" />
</sublayer>
<sublayer>
<property name="width" level="3" value="2.0" />
<property name="width" level="4" value="8.5" />
<property name="width" level="5" value="10.0" />
<property name="width" level="6" value="14.0" />
<property name="width" level="7" value="20.0" />
<property name="width" level="8" value="26.5" />
<property name="width" level="9" value="32.0" />
<property name="width" level="10" value="36.0" />
<property name="color" value="#efbe21ff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="butt" />
</sublayer>
<label>
<property name="color" value="#00000000" />
<property name="font-size" level="6" 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" />
<property name="font-size" level="10" value="26" />
<property name="bold" level="7" value="yes" />
</label>
</layer>
<layer name="major-highway-ramps">
<sublayer>
<property name="width" level="9" value="7.0" />
<property name="width" level="10" value="16.0" />
<property name="color" value="#ada28cff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="butt" />
</sublayer>
<sublayer>
<property name="width" level="7" value="1.0" />
<property name="width" level="9" value="5.5" />
<property name="width" level="10" value="14.0" />
<property name="color" value="#00be00ff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="butt" />
</sublayer>
</layer>
<layer name="railroads">
<sublayer>
<property name="width" level="7" value="0.6" />
<property name="width" level="10" value="1.2" />
<property name="color" value="#50506eff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="butt" />
</sublayer>
<sublayer>
<property name="width" level="7" value="3.0" />
<property name="width" level="9" value="4.0" />
<property name="width" level="10" value="7.0" />
<property name="color" value="#50506eff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="butt" />
</sublayer>
<label>
<property name="color" value="#00000000" />
<property name="font-size" level="7" value="10" />
<property name="halo" level="7" value="4" />
</label>
</layer>
<layer name="parks">
<sublayer>
<property name="width" level="3" value="1.0" />
<property name="color" value="#adca94ff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="butt" />
</sublayer>
<label>
<property name="color" value="#202020ff" />
<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" />
<property name="halo" value="3" />
</label>
</layer>
<layer name="rivers">
<sublayer>
<property name="width" level="5" value="1.0" />
<property name="width" level="6" value="4.0" />
<property name="width" level="7" value="6.0" />
<property name="width" level="8" value="10.0" />
<property name="width" level="9" value="14.0" />
<property name="width" level="10" value="18.0" />
<property name="color" value="#94b2c5ff" />
<property name="join-style" value="round" />
<property name="cap-style" value="round" />
</sublayer>
</layer>
<layer name="lakes">
<sublayer>
<property name="width" level="3" value="1.0" />
<property name="color" value="#94b2c5ff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="butt" />
</sublayer>
<label>
<property name="color" value="#202020ff" />
<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" />
<property name="halo" value="3" />
</label>
</layer>
<layer name="misc-area">
<sublayer>
<property name="width" level="6" value="1.0" />
<property name="color" value="#9b9b9bff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="butt" />
</sublayer>
<label>
<property name="color" value="#404040ff" />
<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" />
<property name="halo" value="3" />
</label>
</layer>
</roadster-layers>
- Previous message: [cairo-commit] roadster ChangeLog,1.30,1.31 configure.ac,1.9,1.10
- Next message: [cairo-commit] roadster/src layers.c, 1.7, 1.8 layers.h, 1.3,
1.4 main.c, 1.8, 1.9 map.c, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cairo-commit
mailing list