jan: thuban/test test_load.py,1.47,1.48
cvs@intevation.de
cvs at intevation.de
Wed Jul 27 23:44:18 CEST 2005
Author: jan
Update of /thubanrepository/thuban/test
In directory doto:/tmp/cvs-serv6516
Modified Files:
test_load.py
Log Message:
(TestSingleLayer, TestNonAsciiColumnName, TestLayerVisibility,
TestSymbolSize, TestClassification, TestLabels, TestLayerProjection,
TestJoinedTable, TestLabelLayer): Removed attributes from layer
element to classification clnull element.
Index: test_load.py
===================================================================
RCS file: /thubanrepository/thuban/test/test_load.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- test_load.py 1 Jul 2005 20:49:04 -0000 1.47
+++ test_load.py 27 Jul 2005 21:44:16 -0000 1.48
@@ -201,9 +201,13 @@
<parameter value="units=m"/>
<parameter value="zone=27"/>
</projection>
- <layer shapestore="D1" visible="true"
- stroke="#000000" title="K\xc3\xbcste" stroke_width="1"
- fill="None"/>
+ <layer shapestore="D1" visible="true" title="K\xc3\xbcste">
+ <classification>
+ <clnull label="">
+ <cldata stroke="#000000" stroke_width="1" fill="None"/>
+ </clnull>
+ </classification>
+ </layer>
</map>
</session>
'''
@@ -293,9 +297,7 @@
<parameter value="units=m"/>
<parameter value="zone=27"/>
</projection>
- <layer shapestore="D1" visible="true"
- stroke="#000000" title="layer" stroke_width="1"
- fill="None">
+ <layer shapestore="D1" visible="true" title="layer">
<classification field="Fl\xc3\xa4che" field_type="double">
<clnull label="">
<cldata stroke="#000000" stroke_width="1" fill="None"/>
@@ -368,8 +370,13 @@
<parameter value="proj=utm"/>
<parameter value="ellps=clrk66"/>
</projection>
- <layer shapestore="D1" visible="false" stroke="#000000"
- title="My Layer" stroke_width="1" fill="None"/>
+ <layer shapestore="D1" visible="false" title="My Layer">
+ <classification>
+ <clnull label="">
+ <cldata stroke="#000000" stroke_width="1" fill="None"/>
+ </clnull>
+ </classification>
+ </layer>
</map>
</session>
'''
@@ -399,7 +406,7 @@
<session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd" title="Thuban sample session">
<fileshapesource filetype="shapefile" id="D813968480" filename="../../Data/iceland/cultural_landmark-point.shp"/>
<map title="Iceland map">
- <layer title="cultural_landmark-point" stroke_width="1" shapestore="D813968480" visible="true" stroke="#000000" fill="#000000">
+ <layer title="cultural_landmark-point" shapestore="D813968480" visible="true">
<classification field="CLPTLABEL" field_type="string">
<clnull label="">
<cldata stroke="#000000" stroke_width="1" size="3" fill="#000000"/>
@@ -455,8 +462,7 @@
<parameter value="proj=utm"/>
<parameter value="ellps=clrk66"/>
</projection>
- <layer shapestore="D138389860" visible="true" stroke="#000000"
- title="My Layer" stroke_width="1" fill="None">
+ <layer shapestore="D138389860" visible="true" title="My Layer">
<classification field="POPYREG" field_type="string">
<clnull label="">
<cldata stroke="#000000" stroke_width="1" fill="None"/>
@@ -473,8 +479,7 @@
</clpoint>
</classification>
</layer>
- <layer shapestore="D138504492" visible="true" stroke="#000000"
- title="My Layer 2" stroke_width="2" fill="None">
+ <layer shapestore="D138504492" visible="true" title="My Layer 2">
<classification field="AREA" field_type="double">
<clnull label="">
<cldata stroke="#000000" stroke_width="2" fill="None"/>
@@ -546,8 +551,7 @@
<parameter value="proj=utm"/>
<parameter value="ellps=clrk66"/>
</projection>
- <layer shapestore="D1" visible="true" stroke="#000000"
- title="My Layer" stroke_width="1" fill="None">
+ <layer shapestore="D1" visible="true" title="My Layer">
<classification field="POPYREG" field_type="string">
<clnull label="hallo">
<cldata stroke="#000000" stroke_width="1" fill="None"/>
@@ -596,8 +600,7 @@
<parameter value="proj=utm"/>
<parameter value="ellps=clrk66"/>
</projection>
- <layer shapestore="D4" visible="true" stroke="#000000"
- title="My Layer" stroke_width="1" fill="None">
+ <layer shapestore="D4" visible="true" title="My Layer">
<projection name="hello">
<parameter value="zone=13"/>
<parameter value="proj=tmerc"/>
@@ -612,14 +615,18 @@
</clpoint>
</classification>
</layer>
- <layer shapestore="D2" visible="true" stroke="#000000"
- title="My Layer" stroke_width="1" fill="None">
+ <layer shapestore="D2" visible="true" title="My Layer">
<projection name="Unknown">
<parameter value="proj=lcc"/>
<parameter value="lat_1=10"/>
<parameter value="lat_2=20"/>
<parameter value="ellps=clrk66"/>
</projection>
+ <classification>
+ <clnull label="">
+ <cldata stroke="#000000" stroke_width="1" fill="None"/>
+ </clnull>
+ </classification>
</layer>
</map>
</session>
@@ -711,8 +718,13 @@
<derivedshapesource table="D136169900" shapesource="D137227612"
id="D136170932"/>
<map title="Test Map">
- <layer shapestore="D136170932" visible="true" stroke="#000000"
- title="My Layer" stroke_width="1" fill="None"/>
+ <layer shapestore="D136170932" visible="true" title="My Layer">
+ <classification>
+ <clnull label="">
+ <cldata stroke="#000000" stroke_width="1" fill="None"/>
+ </clnull>
+ </classification>
+ </layer>
</map>
</session>
'''
@@ -761,21 +773,29 @@
<parameter value="proj=utm"/>
<parameter value="ellps=clrk66"/>
</projection>
- <layer shapestore="D145265052" visible="true" stroke="#000000"
- title="political" stroke_width="1" fill="#c0c0c0">
+ <layer shapestore="D145265052" visible="true" title="political">
<projection name="Geographic">
<parameter value="proj=latlong"/>
<parameter value="to_meter=0.017453"/>
<parameter value="ellps=clrk66"/>
</projection>
+ <classification>
+ <clnull label="">
+ <cldata stroke="#000000" stroke_width="1" fill="#c0c0c0"/>
+ </clnull>
+ </classification>
</layer>
- <layer shapestore="D145412868" visible="true" stroke="#000000"
- title="landmarks" stroke_width="1" fill="#ffff00">
+ <layer shapestore="D145412868" visible="true" title="landmarks">
<projection name="Geographic">
<parameter value="proj=latlong"/>
<parameter value="to_meter=0.017453"/>
<parameter value="ellps=clrk66"/>
</projection>
+ <classification>
+ <clnull label="">
+ <cldata size="5" stroke="#000000" stroke_width="1" fill="#ffff00"/>
+ </clnull>
+ </classification>
</layer>
<labellayer>
<label x="-21.5" y="64.25" text="RUINS"
More information about the Thuban-devel
mailing list
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)