catch up tests with change of bgcolor->background-color

This commit is contained in:
Dane Springmeyer 2010-10-06 18:59:59 +00:00
parent c240208a0f
commit 58b907a61b
34 changed files with 34 additions and 34 deletions

View file

@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="darkfoo"/>
<Map background-color="darkfoo"/>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Map background-color="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Style name="test 1">
<Rule>
<PointSymbolizer file="data/images/dummy.png" type="png" width="16"

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="red">
<Map background-color="red">
<Layer name="some_layer" status="on" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Datasource>
<Parameter name="type">foobar_db</Parameter>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="red">
<Map background-color="red">
<Layer name="some_layer" status="on" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Datasource>
<Parameter name="user">some_one</Parameter>

View file

@ -3,7 +3,7 @@
<!ENTITY db_name "gis">
<!ENTITY db_host "/no/socket/here">
]>
<Map bgcolor="red">
<Map background-color="red">
<Layer name="some_layer" status="on" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Datasource>
<Parameter name="type">postgis</Parameter>

View file

@ -3,7 +3,7 @@
<!ENTITY db_user "foobar">
<!ENTITY db_name "gis">
]>
<Map bgcolor="red">
<Map background-color="red">
<Layer name="some_layer" status="on" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Datasource>
<Parameter name="type">postgis</Parameter>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Map background-color="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Style name="some_style">
<Rule>
<TextSymbolizer name="[foo]" face_name="foobar" size="12"/>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="red">
<Map background-color="red">
<Style name="some_style">
<Rule name="some_rule">
<LineSymbolizer stroke-linecap="fooish" />

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="red">
<Map background-color="red">
<Style name="some_style">
<Rule name="some_rule">
<LineSymbolizer stroke-linejoin="meta" />

View file

@ -1,3 +1,3 @@
<Map bgcolor="steelblue" minimum_version="50.0.0">
<Map background-color="steelblue" minimum_version="50.0.0">
<!-- arbitrarily large version number that should throw error -->
</Map>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Map background-color="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Style name="some_style">
<Rule>
<PolygonPatternSymbolizer width="16" type="png"/>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Map background-color="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Style name="some_style">
<Rule>
<ShieldSymbolizer name="[foo.ttf]" face_name="bold" size="10" fill="#444"

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="red">
<Map background-color="red">
<Style name="some_style">
<Rule name="some_rule">
<LineSymbolizer stoke="red" stroke-dasharray="1.0, 4.0, foo, 6.0" />

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Map background-color="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Style name="some_style">
<Rule>
<TextSymbolizer name="foo.ttf" face_name="bold" size="-5"/>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Map background-color="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Style name="some_style">
<Rule>
<Filter>[mapnik:geometry] = 1</Filter>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Map srs="+proj=merc +lon_0=0 +lat_ts=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs" bgcolor="steelblue">
<Map srs="+proj=merc +lon_0=0 +lat_ts=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs" background-color="steelblue">
<Style name="style">
<!-- Asia - default dark color behind light polygon

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs" paths_from_xml="false">
<Map background-color="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs" paths_from_xml="false">
<Style name="test 1">
<Rule>
<PointSymbolizer file="../data/images/dummy.png" type="png" width="16"

View file

@ -1,4 +1,4 @@
<Map bgcolor="steelblue" srs="+proj=longlat +ellps=airy +datum=OSGB36 +no_defs">
<Map background-color="steelblue" srs="+proj=longlat +ellps=airy +datum=OSGB36 +no_defs">
<Style name="test">
<Rule>

View file

@ -1,5 +1,5 @@
<!-- see: http://trac.mapnik.org/changeset/574 -->
<Map bgcolor="steelblue" srs="+proj=longlat +ellps=airy +datum=OSGB36 +no_defs">
<Map background-color="steelblue" srs="+proj=longlat +ellps=airy +datum=OSGB36 +no_defs">
<Style name="test">
<Rule>

View file

@ -1,5 +1,5 @@
<!-- see: http://trac.mapnik.org/changeset/574 -->
<Map bgcolor="steelblue" srs="+proj=longlat +ellps=airy +datum=OSGB36 +no_defs">
<Map background-color="steelblue" srs="+proj=longlat +ellps=airy +datum=OSGB36 +no_defs">
<FileSource name="foo">../images/</FileSource>

View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='ASCII' standalone='yes'?>
<!DOCTYPE Map>
<Map bgcolor="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Map background-color="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Style name="mapnik:selection">
<Rule>
<Filter>[mapnik:geometry] = 1</Filter>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="#b5d0d0" srs="+init=epsg:4326" min_version="0.7.1">
<Map background-color="#b5d0d0" srs="+init=epsg:4326" min_version="0.7.1">
<Style name="1">
<Rule title="foo">
<Filter>([name]='CHILE')</Filter>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="#b5d0d0" min_version="0.7.1">
<Map background-color="#b5d0d0" min_version="0.7.1">
<Style name="test">
<Rule title="asia">
<Filter>([REGION]=142)</Filter>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- see: http://trac.mapnik.org/changeset/574 -->
<Map bgcolor="transparent" srs="+proj=longlat +ellps=airy +datum=OSGB36 +no_defs">
<Map background-color="transparent" srs="+proj=longlat +ellps=airy +datum=OSGB36 +no_defs">
<FileSource name="foo">../images/</FileSource>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Map srs="+init=epsg:4326" bgcolor="rgb(255,255,255)">
<Map srs="+init=epsg:4326" background-color="rgb(255,255,255)">
<Style name="point_style">
<Rule>
<PointSymbolizer file="../svg/point.svg"/>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Map srs="+proj=merc +lon_0=0 +lat_ts=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs" bgcolor="steelblue">
<Map srs="+proj=merc +lon_0=0 +lat_ts=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs" background-color="steelblue">
<Style name="labels">
<Rule title="foo">

View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='ASCII' standalone='yes'?>
<Map srs="+proj=tmerc +lat_0=49 +lon_0=-2 +k=0.9996012717 +x_0=400000 +y_0=-100000 +ellps=airy +units=m +no_defs" bgcolor="rgba(0,0,0,0)">
<Map srs="+proj=tmerc +lat_0=49 +lon_0=-2 +k=0.9996012717 +x_0=400000 +y_0=-100000 +ellps=airy +units=m +no_defs" background-color="rgba(0,0,0,0)">
<Style name="poly20090929162130952_style">
<Rule>
<Filter>([EAS_ID]!=158)</Filter>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Map background-color="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Style name="text">
<Rule>
<Filter>[leisure] &lt;&gt; '' or [landuse] &lt;&gt; '' </Filter>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map xmlns:xi="http://www.w3.org/2001/XInclude" srs="+init=epsg:4326" bgcolor="rgb(255,255,255)" >
<Map xmlns:xi="http://www.w3.org/2001/XInclude" srs="+init=epsg:4326" background-color="rgb(255,255,255)" >
<!-- http://www.oreillynet.com/xml/blog/2004/05/transclude_with_xinclude_and_x.html -->

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map xmlns:xi="http://www.w3.org/2001/XInclude" srs="+init=epsg:4326" bgcolor="rgb(255,255,255)" >
<Map xmlns:xi="http://www.w3.org/2001/XInclude" srs="+init=epsg:4326" background-color="rgb(255,255,255)" >
<!-- http://www.oreillynet.com/xml/blog/2004/05/transclude_with_xinclude_and_x.html -->

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Map background-color="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Style name="some_style">
<Rule>
<LinePatternSymbolizer file="foo.png" />

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Map background-color="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Style name="some_style">
<Rule>
<PolygonPatternSymbolizer width="16" height="16" type="png" file="/no/shuch/icon.png"/>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map >
<Map bgcolor="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Map background-color="#b5d0d0" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs">
<Style name="some_style">
<Rule>
<PointSymbolizer file="foo.png"/>

View file

@ -255,7 +255,7 @@ def test_map_init():
# Map initialization from string
def test_map_init_from_string():
map_string = '''<Map bgcolor="steelblue" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
map_string = '''<Map background-color="steelblue" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<Style name="My Style">
<Rule>
<PolygonSymbolizer>