Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Removed some old query hacks that mapnik can now do natively

  • Loading branch information...
commit 2a1c2e9733b0e7e975cf92d82f867fe44ffb764b 1 parent 18c1978
Lars Ahlzen authored
Showing with 16 additions and 19 deletions.
  1. +1 −1  include/labels.inc.templ
  2. +15 −18 templates/features.xml.templ
2  include/labels.inc.templ
View
@@ -250,7 +250,7 @@
<TextSymbolizer face-name="DejaVu Sans Book" size="10"
fill="&contourcolor;" dy="22" wrap-width="100"
halo-fill="transparent" halo-radius="4"
- >[ele_w_unit]</TextSymbolizer>
+ >[ele_ft]+' ft'</TextSymbolizer>
</Rule>
<Rule>
&minz13;
33 templates/features.xml.templ
View
@@ -687,30 +687,27 @@ only major NHD features ("lowzoom") are used. -->
<Layer name="pointfeaturenames" status="on">
<StyleName>featurenames</StyleName>
<Datasource>
- &dbsettings; &extents;
- <!--
- HACK: postgres converts elevation m -> ft, and appends unit
- NOTE: The CASE is a workaround for when 'm' is explicitly specified
- as the unit.
- -->
- <Parameter name="table">
- (SELECT way, name, "natural", aeroway, railway, landuse, leisure,
- boundary, 0 as way_area, CAST(ele_ft AS VARCHAR) ||
- ' ft' as ele_w_unit
- FROM ${DB_PREFIX}_point) AS featurenames
- </Parameter>
+ &dbsettings; &extents;
+ <Parameter name="table">
+ (SELECT way, name, "natural", aeroway, railway, landuse, leisure,
+ boundary, 0 as way_area, ele_ft
+ FROM ${DB_PREFIX}_point) AS featurenames
+ </Parameter>
+ <Parameter name="geometry_field">way</Parameter>
</Datasource>
</Layer>
<Layer name="areafeaturenames" status="on">
<StyleName>featurenames</StyleName>
<Datasource>
- &dbsettings; &extents;
- <Parameter name="table">
- (SELECT way, name, "natural", aeroway, railway, landuse, leisure,
- boundary, way_area, '' AS ele_w_unit
- FROM ${DB_PREFIX}_polygon ORDER BY z_order, way_area DESC)
- AS areafeaturenames</Parameter>
+ &dbsettings; &extents;
+ <Parameter name="table">
+ (SELECT way, name, "natural", aeroway, railway, landuse, leisure,
+ boundary, way_area, 0 AS ele_ft
+ FROM ${DB_PREFIX}_polygon ORDER BY z_order, way_area DESC)
+ AS featurenames
+ </Parameter>
+ <Parameter name="geometry_field">way</Parameter>
</Datasource>
</Layer>
Please sign in to comment.
Something went wrong with that request. Please try again.