cartodb/carto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing other test cases for new textsymbolizer syntax

Browse Source
This commit is contained in:
Tom MacWright 2011-10-20 04:42:36 -04:00
parent 634e9014e2
commit e830559d81
5 changed files with 890 additions and 889 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/rendering/fontset-duplication.mml
View File

@ -28,7 +28,7 @@
"srs":"",
"class":"",
"Datasource":{
"file":"http://dl.dropbox.com/u/2398828/world-labels2.zip",
"file":"http://tilemill-data.s3.amazonaws.com/natural-earth-10m-1.3.0/populated_places_simple.zip",
"type":"shape"
},
"geometry":"point"

1748
test/rendering/fontset-duplication.result
View File

File diff suppressed because it is too large Load Diff

16
test/rendering/issue_100_filters.result
View File

@ -7,41 +7,41 @@
<Rule>
<MaxScaleDenominator>400000</MaxScaleDenominator>
<Filter>([area] &gt; 16000000)</Filter>
<TextSymbolizer name="[name]" face-name="Helvetica" halo-fill="#ffffff" halo-radius="2" placement="interior" size="11" wrap-width="20" />
<TextSymbolizer face-name="Helvetica" halo-fill="#ffffff" halo-radius="2" placement="interior" size="11" wrap-width="20" >[name]</TextSymbolizer>
</Rule>
<Rule>
<MaxScaleDenominator>200000</MaxScaleDenominator>
<Filter>([area] &gt; 4000000)</Filter>
<TextSymbolizer name="[name]" face-name="Helvetica" halo-fill="#ffffff" halo-radius="2" placement="interior" size="11" wrap-width="20" />
<TextSymbolizer face-name="Helvetica" halo-fill="#ffffff" halo-radius="2" placement="interior" size="11" wrap-width="20" >[name]</TextSymbolizer>
</Rule>
<Rule>
<MaxScaleDenominator>100000</MaxScaleDenominator>
<Filter>([area] &gt; 1000000)</Filter>
<TextSymbolizer name="[name]" face-name="Helvetica" halo-fill="#ffffff" halo-radius="2" placement="interior" size="11" wrap-width="20" />
<TextSymbolizer face-name="Helvetica" halo-fill="#ffffff" halo-radius="2" placement="interior" size="11" wrap-width="20" >[name]</TextSymbolizer>
</Rule>
<Rule>
<MaxScaleDenominator>50000</MaxScaleDenominator>
<Filter>([area] &gt; 500000)</Filter>
<TextSymbolizer name="[name]" face-name="Helvetica" halo-fill="#ffffff" halo-radius="2" placement="interior" size="11" wrap-width="20" />
<TextSymbolizer face-name="Helvetica" halo-fill="#ffffff" halo-radius="2" placement="interior" size="11" wrap-width="20" >[name]</TextSymbolizer>
</Rule>
<Rule>
<MaxScaleDenominator>25000</MaxScaleDenominator>
<Filter>([area] &gt; 250000)</Filter>
<TextSymbolizer name="[name]" face-name="Helvetica" halo-fill="#ffffff" halo-radius="2" placement="interior" size="11" wrap-width="20" />
<TextSymbolizer face-name="Helvetica" halo-fill="#ffffff" halo-radius="2" placement="interior" size="11" wrap-width="20" >[name]</TextSymbolizer>
</Rule>
<Rule>
<MaxScaleDenominator>12500</MaxScaleDenominator>
<Filter>([area] &gt; 125000)</Filter>
<TextSymbolizer name="[name]" face-name="Helvetica" halo-fill="#ffffff" halo-radius="2" placement="interior" size="11" wrap-width="20" />
<TextSymbolizer face-name="Helvetica" halo-fill="#ffffff" halo-radius="2" placement="interior" size="11" wrap-width="20" >[name]</TextSymbolizer>
</Rule>
<Rule>
<MaxScaleDenominator>5000</MaxScaleDenominator>
<Filter>([area] &gt; 62500)</Filter>
<TextSymbolizer name="[name]" face-name="Helvetica" halo-fill="#ffffff" halo-radius="2" placement="interior" size="11" wrap-width="20" />
<TextSymbolizer face-name="Helvetica" halo-fill="#ffffff" halo-radius="2" placement="interior" size="11" wrap-width="20" >[name]</TextSymbolizer>
</Rule>
<Rule>
<MaxScaleDenominator>2500</MaxScaleDenominator>
<TextSymbolizer name="[name]" face-name="Helvetica" halo-fill="#ffffff" halo-radius="2" placement="interior" size="11" wrap-width="20" />
<TextSymbolizer face-name="Helvetica" halo-fill="#ffffff" halo-radius="2" placement="interior" size="11" wrap-width="20" >[name]</TextSymbolizer>
</Rule>
</Style>
<Layer name="world"

2
test/rendering/simplefontset.result
View File

@ -8,7 +8,7 @@
</FontSet>
<Style name="world" filter-mode="first">
<Rule>
<TextSymbolizer name="[NAME]" size="11" fontset-name="fontset-0" />
<TextSymbolizer size="11" fontset-name="fontset-0">[NAME]</TextSymbolizer>
</Rule>
</Style>
<Layer

11
test/rendering/text_property_overrides.result
View File

@ -7,21 +7,24 @@
<Rule>
<MaxScaleDenominator>6500000</MaxScaleDenominator>
<MinScaleDenominator>3000000</MinScaleDenominator>
<TextSymbolizer size="12" name="[COUNTRY]" face-name="DejaVu Sans Book" fill="#000000" />
<TextSymbolizer size="12" face-name="DejaVu Sans Book" fill="#000000">[COUNTRY]</TextSymbolizer>
</Rule>
<Rule>
<MaxScaleDenominator>12500000</MaxScaleDenominator>
<MinScaleDenominator>6500000</MinScaleDenominator>
<TextSymbolizer size="11" name="[COUNTRY]" face-name="DejaVu Sans Book" fill="#000000" />
<TextSymbolizer size="11" face-name="DejaVu Sans Book" fill="#000000">[COUNTRY]</TextSymbolizer>
</Rule>
<Rule>
<MaxScaleDenominator>25000000</MaxScaleDenominator>
<MinScaleDenominator>12500000</MinScaleDenominator>
<TextSymbolizer size="10" name="[COUNTRY]" face-name="DejaVu Sans Book" fill="#000000" />
<TextSymbolizer size="10" face-name="DejaVu Sans Book" fill="#000000">[COUNTRY]</TextSymbolizer>
</Rule>
<Rule>
<MaxScaleDenominator>50000000</MaxScaleDenominator>
<TextSymbolizer size="9" name="[COUNTRY]" face-name="DejaVu Sans Book" fill="#000000" />
<TextSymbolizer size="9" face-name="DejaVu Sans Book" fill="#000000">[COUNTRY]</TextSymbolizer>
</Rule>
</Style>
<Layer