Skip to content

Commit dd0c41c

Browse files
artempartemp
committed
Use epsg:XXXX syntax to define SRS (old proj4 syntax is not recommended in proj >=6)
1 parent 004b170 commit dd0c41c

55 files changed

Lines changed: 211 additions & 211 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎broken_maps/bool_value_broken.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!DOCTYPE Map>
2-
<Map background-color="#b5d0d0" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" minimum-version="0.7.2">
2+
<Map background-color="#b5d0d0" srs="epsg:3857" minimum-version="0.7.2">
33
<Style name="test 1">
44
<Rule>
55
<PointSymbolizer file="data/images/dummy.png" allow-overlap="maybe"/>
66
</Rule>
77
</Style>
8-
</Map>
8+
</Map>

‎broken_maps/datasource_type_broken.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE Map>
22
<Map background-color="red" minimum-version="0.7.2">
3-
<Layer name="some_layer" status="on" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
3+
<Layer name="some_layer" status="on" srs="epsg:3857">
44
<Datasource>
55
<Parameter name="type">foobar_db</Parameter>
66
<Parameter name="user">some_one</Parameter>
@@ -9,4 +9,4 @@
99
</Datasource>
1010
</Layer>
1111

12-
</Map>
12+
</Map>

‎broken_maps/datasource_type_missing.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!DOCTYPE Map>
22
<Map background-color="red" minimum-version="0.7.2">
3-
<Layer name="some_layer" status="on" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
3+
<Layer name="some_layer" status="on" srs="epsg:3857">
44
<Datasource>
55
<Parameter name="user">some_one</Parameter>
66
<Parameter name="password">SECRET</Parameter>
77
<Parameter name="dbname">gis</Parameter>
88
</Datasource>
99
</Layer>
1010

11-
</Map>
11+
</Map>

‎broken_maps/db_host_broken.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!ENTITY db_host "/no/socket/here">
44
]>
55
<Map background-color="red" minimum-version="0.7.2">
6-
<Layer name="some_layer" status="on" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
6+
<Layer name="some_layer" status="on" srs="epsg:3857">
77
<Datasource>
88
<Parameter name="type">postgis</Parameter>
99
<Parameter name="host">/no/socket/here</Parameter>
@@ -12,4 +12,4 @@
1212
</Datasource>
1313
</Layer>
1414

15-
</Map>
15+
</Map>

‎broken_maps/db_user_broken.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!ENTITY db_name "gis">
44
]>
55
<Map background-color="red" minimum-version="0.7.2">
6-
<Layer name="some_layer" status="on" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
6+
<Layer name="some_layer" status="on" srs="epsg:3857">
77
<Datasource>
88
<Parameter name="type">postgis</Parameter>
99
<Parameter name="user">foobar</Parameter>
@@ -12,4 +12,4 @@
1212
</Datasource>
1313
</Layer>
1414

15-
</Map>
15+
</Map>

‎broken_maps/font_name_broken.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!DOCTYPE Map>
2-
<Map background-color="#b5d0d0" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" minimum-version="0.7.2">
2+
<Map background-color="#b5d0d0" srs="epsg:3857" minimum-version="0.7.2">
33
<Style name="some_style">
44
<Rule>
55
<TextSymbolizer size="12" face-name="foobar">[foo]</TextSymbolizer>
66
</Rule>
77
</Style>
8-
</Map>
8+
</Map>

‎broken_maps/polygon_pattern_symbolizer_broken.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!DOCTYPE Map>
2-
<Map background-color="#b5d0d0" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" minimum-version="0.7.2">
2+
<Map background-color="#b5d0d0" srs="epsg:3857" minimum-version="0.7.2">
33
<Style name="some_style">
44
<Rule>
55
<PolygonPatternSymbolizer/>
66
</Rule>
77
</Style>
8-
</Map>
8+
</Map>

‎broken_maps/shield_symbolizer_broken.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!DOCTYPE Map>
2-
<Map background-color="#b5d0d0" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" minimum-version="0.7.2">
2+
<Map background-color="#b5d0d0" srs="epsg:3857" minimum-version="0.7.2">
33
<Style name="some_style">
44
<Rule>
55
<ShieldSymbolizer size="10" fill="#444" file="data/images/dummy.png" face-name="bold">[foo.ttf]</ShieldSymbolizer>
66
</Rule>
77
</Style>
8-
</Map>
8+
</Map>

‎broken_maps/text_symbolizer_broken.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!DOCTYPE Map>
2-
<Map background-color="#b5d0d0" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" minimum-version="0.7.2">
2+
<Map background-color="#b5d0d0" srs="epsg:3857" minimum-version="0.7.2">
33
<Style name="some_style">
44
<Rule>
55
<TextSymbolizer size="-5" face-name="bold">invalid bare string</TextSymbolizer>
66
</Rule>
77
</Style>
8-
</Map>
8+
</Map>

‎broken_maps/xml_tag_mismatch.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE Map >
3-
<Map background-color="#b5d0d0" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
3+
<Map background-color="#b5d0d0" srs="epsg:3857">
44
<Style name="some_style">
55
<Rule>
6-
<Filter>[mapnik:geometry] = 1</Filter>
6+
<Filter>[mapnik:geometry] = 1</Filter>
77
<PointSymbolizer/>
88
</Rule>
99
</FOOBAR>

0 commit comments

Comments
 (0)