Merge remote-tracking branch 'upstream/master'

Conflicts: templates/features.xml.templ
bnordgren · Apr 22, 2013 · 9810037 · 9810037
2 parents c3a4c25 + a9cf10f
commit 9810037
Show file tree

Hide file tree

Showing 8 changed files with 357 additions and 232 deletions.
diff --git a/README.md b/README.md
@@ -65,8 +65,8 @@ BOOST_INCLUDES=$HOME/include BOOST_LIBS=$HOME/lib
 * http://tile.openstreetmap.org/shoreline_300.tar.bz2
 * http://www.naturalearthdata.com/download/10m/cultural/10m-populated-places.zip
 * http://www.naturalearthdata.com/download/110m/cultural/110m-admin-0-boundary-lines.zip
-* USGS NHD shapefiles: http://www.openstreetmap.us/nhd/
-* USGS NED data, as needed: http://openstreetmap.us/ned/13arcsec/grid/
+* USGS NHD shapefiles: http://209.98.153.33/nhd/
+* USGS NED data, as needed: http://209.98.153.33/ned/13arcsec/grid/
 * NLCD 2006 (Land cover) data: http://www.mrlc.gov/nlcd06_data.php
 * Planet.osm or other OSM dataset: http://planet.openstreetmap.org/
 * Water polygons (in spherical mercator) from http://openstreetmapdata.com/

diff --git a/custom-symbols/peak.svg b/custom-symbols/peak.svg
diff --git a/custom-symbols/power-tower.svg b/custom-symbols/power-tower.svg
diff --git a/custom-symbols/rail-station.svg b/custom-symbols/rail-station.svg
diff --git a/include/labels.inc.templ b/include/labels.inc.templ
@@ -208,7 +208,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;

diff --git a/include/nhd.inc.templ b/include/nhd.inc.templ
@@ -170,7 +170,7 @@ they will be filled later, effectively halving the stroke width.
     <Filter>
       &isNHDManmadeLine;
     </Filter>
-    <LineSymbolizer stroke="#666;" stroke-width="0.6" />
+    <LineSymbolizer stroke="#666" stroke-width="0.6" />
   </Rule>
 
   <Rule>