From 2a1c2e9733b0e7e975cf92d82f867fe44ffb764b Mon Sep 17 00:00:00 2001 From: Ahlzen Date: Sun, 22 Jul 2012 15:02:27 -0400 Subject: [PATCH 1/4] Removed some old query hacks that mapnik can now do natively --- include/labels.inc.templ | 2 +- templates/features.xml.templ | 33 +++++++++++++++------------------ 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/include/labels.inc.templ b/include/labels.inc.templ index 27ba912..b81aa80 100644 --- a/include/labels.inc.templ +++ b/include/labels.inc.templ @@ -250,7 +250,7 @@ [ele_w_unit] + >[ele_ft]+' ft' &minz13; diff --git a/templates/features.xml.templ b/templates/features.xml.templ index d9b47e3..4afb31a 100644 --- a/templates/features.xml.templ +++ b/templates/features.xml.templ @@ -687,30 +687,27 @@ only major NHD features ("lowzoom") are used. --> featurenames - &dbsettings; &extents; - - - (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 - + &dbsettings; &extents; + + (SELECT way, name, "natural", aeroway, railway, landuse, leisure, + boundary, 0 as way_area, ele_ft + FROM ${DB_PREFIX}_point) AS featurenames + + way featurenames - &dbsettings; &extents; - - (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 + &dbsettings; &extents; + + (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 + + way From 9de9125a67da7679bebbf34ecd5da6c7513cabfd Mon Sep 17 00:00:00 2001 From: Ahlzen Date: Fri, 27 Jul 2012 21:24:28 -0400 Subject: [PATCH 2/4] Switched all map symbols to use SVG icons. --- custom-symbols/peak.svg | 61 +++--- custom-symbols/power-tower.svg | 67 ++++++ custom-symbols/rail-station.svg | 67 ++++++ include/symbols.inc.templ | 351 ++++++++++++++++---------------- 4 files changed, 334 insertions(+), 212 deletions(-) create mode 100644 custom-symbols/power-tower.svg create mode 100644 custom-symbols/rail-station.svg diff --git a/custom-symbols/peak.svg b/custom-symbols/peak.svg index 977e854..36fdc7b 100644 --- a/custom-symbols/peak.svg +++ b/custom-symbols/peak.svg @@ -1,5 +1,6 @@ + + width="1" + height="1" + id="svg2996" + version="1.1" + inkscape:version="0.48.2 r9819" + sodipodi:docname="New document 2"> - - - + id="defs2998" /> + inkscape:window-y="23" + inkscape:window-maximized="1" /> + id="metadata3001"> image/svg+xml + + id="layer1" + transform="translate(0,-1051.3622)"> diff --git a/custom-symbols/power-tower.svg b/custom-symbols/power-tower.svg new file mode 100644 index 0000000..b6e43e7 --- /dev/null +++ b/custom-symbols/power-tower.svg @@ -0,0 +1,67 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/custom-symbols/rail-station.svg b/custom-symbols/rail-station.svg new file mode 100644 index 0000000..a50f3bf --- /dev/null +++ b/custom-symbols/rail-station.svg @@ -0,0 +1,67 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/include/symbols.inc.templ b/include/symbols.inc.templ index 2f3a85c..283a1aa 100644 --- a/include/symbols.inc.templ +++ b/include/symbols.inc.templ @@ -1,132 +1,134 @@ - From a861121f1fdfacee54f8972656b163755a82d042 Mon Sep 17 00:00:00 2001 From: Ahlzen Date: Thu, 2 Aug 2012 17:12:55 -0400 Subject: [PATCH 3/4] Fixed typo --- include/nhd.inc.templ | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/nhd.inc.templ b/include/nhd.inc.templ index 451d179..f1b0a6e 100644 --- a/include/nhd.inc.templ +++ b/include/nhd.inc.templ @@ -170,7 +170,7 @@ they will be filled later, effectively halving the stroke width. &isNHDManmadeLine; - + From a9cf10fafaf0539ca5b9753db87c12d50e755fdf Mon Sep 17 00:00:00 2001 From: Ahlzen Date: Sun, 24 Mar 2013 11:51:33 -0400 Subject: [PATCH 4/4] Changed NED/NHD download link to IP of old OSM-US servers --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1f7c9f5..d9fb90e 100644 --- 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/