Changeset 71

Timestamp:

13.10.2009 11:05:51 (6 weeks ago)

Author:

blackhex

Message:

• Script that generates nice OpenStretmapPosters? added.
• osm-template.xml and other relevant files removed. New osm.xml and new Mapnik style customization schema introduced.
• openlayes.html updated.
• generate_tiles.py uses internal mapnik buffer at borders now.

Location:

OpenTrackMap

Files:

• . (modified) (1 prop)
• bin (modified) (1 prop)
• bin/full_update_osmosis.py (modified) (2 diffs)
• bin/incremental_update_osm2pgsql.py (modified) (1 diff)
• bin/relations2lines.py (modified) (1 diff)
• mapnik/README (deleted)
• mapnik/convert-fontset (deleted)
• mapnik/convert-template (deleted)
• mapnik/default.style (modified) (1 diff)
• mapnik/generate_poster.py (added)
• mapnik/generate_tiles.py (modified) (5 diffs)
• mapnik/generate_tiles2.py (deleted)
• mapnik/inc (added)
• mapnik/inc/datasource-settings.xml.inc (added)
• mapnik/inc/entities.xml.inc (added)
• mapnik/inc/fontset-settings.xml.inc (added)
• mapnik/inc/latlon-datasource-settings.xml.inc (added)
• mapnik/inc/settings.xml.inc (added)
• mapnik/openlayers.html (modified) (1 diff)
• mapnik/osm-template-fontset.xml (deleted)
• mapnik/osm-template.xml (deleted)
• mapnik/osm.xml (added)
• mapnik/osm.xml.diff (added)
• mapnik/symbols/bus_station.n.16.png (added)
• mapnik/symbols/bus_stop_small.png (added)
• mapnik/symbols/caravan_park.p.24.png (added)
• mapnik/symbols/embassy.png (added)
• mapnik/symbols/guest_house.p.16.png (added)
• mapnik/symbols/hostel.p.20.png (added)
• mapnik/symbols/memorial.png (added)
• mapnik/symbols/school.png (added)
• mapnik/symbols/spring.png (added)
• mapnik/symbols/traffic_light.png (added)
• mapnik/uncustomize-mapnik-map (deleted)
• mapnik/zoom-to-scale.txt (deleted)
• usgs_srtm/srtm2contours.sh (modified) (1 diff)
• usgs_srtm/srtm2shade.sh (modified) (1 diff)

OpenTrackMap

@@ -1 @@
-demtools
-osm2pgsql
 commit.sh

@@ -1 @@
-demtools
-osm2pgsql
 commit.sh

OpenTrackMap/bin/full_update_osmosis.py

@@ -21 +21 @@
     return system(command)
 
-"""for I in range(14):
+for I in range(14):
     # Delete previous planet file.
     execute("rm -rf %s" % (osm_data_file,))
@@ -36 +36 @@
 
 # Bound it with bonding region of CR.
+#execute('bzcat %s | %s --read-xml file=- --bounding-box left="12.10"'
+  #' right="18.87" top="51.06" bottom="48.55" --write-xml file=%s' % (
+  #osm_data_file, osmosis, otm_data_file))
 execute('bzcat %s | %s --read-xml file=- --bounding-box left="12.10"'
-  ' right="18.87" top="51.06" bottom="48.55" --write-xml file=%s' % (
-  osm_data_file, osmosis, otm_data_file))"""
-
-timestamp = '090902'
+  ' right="18.87" top="51.32" bottom="48.27" --write-xml file=%s' % (
+  osm_data_file, osmosis, otm_data_file))
 
 # Import data to database.

OpenTrackMap/bin/incremental_update_osm2pgsql.py

@@ -7 +7 @@
 from re import match
 
+bin_prefix="/home/blackhex/OpenTrackMap/"
 prefix = "/mnt/data/OpenTrackMap/"
 mirror = "http://planet.openstreetmap.org"
-osmosis = prefix + "bin/osmosis-0.31/bin/osmosis"
-osm2pgsql = prefix + "bin/osm2pgsql/osm2pgsql"
+osmosis = bin_prefix + "bin/osmosis-0.31/bin/osmosis"
+osm2pgsql = bin_prefix + "bin/osm2pgsql/osm2pgsql"
 timestamp_filename = prefix + "opentrackmap.timestamp"
 bbox = "12.10,48.55,18.87,51.06"

OpenTrackMap/bin/relations2lines.py

@@ -16 +16 @@
 
 # Clean previous tracks.
-auxilary_cursor.execute("DELETE FROM planet_osm_track_rels")
+auxilary_cursor.execute("DROP TABLE IF EXISTS planet_osm_track_rels")
+auxilary_cursor.execute("CREATE TABLE planet_osm_track_rels AS SELECT * FROM planet_osm_line WHERE osm_id = 0")
+auxilary_cursor.execute("INSERT INTO geometry_columns VALUES ('', 'public', 'planet_osm_track_rels', 'way', 2, 900910, 'LINESTRING')")
 
 # Select all route relations.

OpenTrackMap/mapnik/default.style

@@ -116 +116 @@
 
 # International hiking tracks.
+way       network              text  linear
 way       iwn                  text  linear
 

OpenTrackMap/mapnik/generate_tiles.py

@@ -8 +8 @@
 import sys, os
 
-os.environ['LD_LIBRARY_PATH'] = '/home/blackhex/local/Mapnik/lib'
 path = ['/home/blackhex/local/Mapnik/lib/python2.6/site-packages']
 path.extend(sys.path)
@@ -62 +61 @@
     # Setup Mapnik
     gprj = GoogleProjection(maxZoom + 1) 
-    m = Map(2 * 256, 2 * 256)
-    load_map(m, mapFile)
+    m = Map(256, 256)
+    load_map(m, mapFile, True)
     prj = Projection("+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0"
       " +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over")
@@ -104 +103 @@
 
                 bbox = Envelope(c0.x,c0.y,c1.x,c1.y)
-                bbox.width(bbox.width() * 2)
-                bbox.height(bbox.height() * 2)
                 m.zoom_to_box(bbox)
+                m.buffer_size = 64
 
                 str_y = "%s" % y
-
                 tileHQFile = os.path.join(tileHQDir, zoom, str_x, str_y + '.png')
                 tileSQFile = os.path.join(tileSQDir, zoom, str_x, str_y + '.png')
@@ -117 +114 @@
                     exists = "exists"
                 else:
-                    im = Image(512, 512)
-                    render(m, im)
-                    view = im.view(128,128,256,256) # x,y,width,height
+                    image = Image(256, 256)
+                    render(m, image)
 
                     fsLock.acquire()
                     # We should check file existance aggain for atomicity.
                     if not os.path.exists(tileHQFile):
-                        view.save(tileHQFile,'png')
+                        image.save(tileHQFile,'png')
                     fsLock.release()
 
@@ -189 +185 @@
 
     # Czech Republic
-    minZoom = 0
+    minZoom = 1
     maxZoom = 14
     bbox = (12.10, 48.55, 18.87, 51.06)
 
     # Sluknov
-    #minZoom = 0
+    #minZoom = 1
     #maxZoom = 15
     #bbox = (14.16, 50.86, 14.40, 50.95)
 
     # Brno
-    #minZoom = 0
+    #minZoom = 1
     #maxZoom = 15
     #bbox = (16.4646, 49.1254, 16.7214, 49.3106)
 
     # Ricany - Kostelec nad Cernymi Lesy
-    #minZoom = 9
+    #minZoom = 1
     #maxZoom = 17
     #bbox = (14.62, 49.95, 14.91, 50.04)
 
     # Beskydy - TravnÜ
-    #minZoom = 13
+    #minZoom = 1
     #maxZoom = 17
     #bbox = (18.42, 49.49, 18.66, 49.62)
 
     # Krkonoše
-    #minZoom = 9
+    #minZoom = 1
     #maxZoom = 17
     #bbox = (15.10, 50.76, 15.40, 50.88)
 
     # Tišnov
-    #minZoom = 9
+    #minZoom = 1
     #maxZoom = 17
     #bbox = (16.41, 49.34, 16.43, 49.36)

OpenTrackMap/mapnik/openlayers.html

@@ -1 +1 @@
 <html>
 <head>
-    <title>OpenStreetMap</title>
- 
-    <!-- bring in the OpenLayers javascript library
-         (here we bring it from the remote site, but you could
-         easily serve up this javascript yourself) -->
-    <script src="http://www.openlayers.org/api/OpenLayers.js"></script>
- 
-    <!-- bring in the OpenStreetMap OpenLayers layers.
-         Using this hosted file will make sure we are kept up
-         to date with any necessary changes -->
-    <script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script>
- 
-    <script type="text/javascript">
-        // Start position for the map (hardcoded here for simplicity,
-        // but maybe you want to get from URL params)
-        // (Though to get it from the URL it's simpler to use the Permalink and ArgParser controls)
-        var lat=49.19
-        var lon=16.61
-        var zoom=13
- 
-        var map; //complex object of type OpenLayers.Map
- 
-        //Initialise the 'map' object
-        function init() {
- 
-            map = new OpenLayers.Map ("map", {
-                controls:[
-                    new OpenLayers.Control.Navigation(),
+  <title>OpenStreetMap</title>
+
+  <!-- bring in the OpenLayers javascript library
+       (here we bring it from the remote site, but you could
+       easily serve up this javascript yourself) -->
+  <script src="http://www.openlayers.org/api/OpenLayers.js"></script>
+
+  <!-- bring in the OpenStreetMap OpenLayers layers.
+       Using this hosted file will make sure we are kept up
+       to date with any necessary changes -->
+  <script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script>
+
+  <script type="text/javascript">
+    // Start position for the map (hardcoded here for simplicity,
+    // but maybe you want to get from URL params)
+    // (Though to get it from the URL it's simpler to use the Permalink and ArgParser controls)
+    var lat=49.7
+    var lon=15.2
+    var zoom=7
+
+    var map; //complex object of type OpenLayers.Map
+
+    function getTileURL(bounds)
+    {
+      var res = this.map.getResolution();
+      var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
+      var y = Math.round((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
+      var z = this.map.getZoom();
+      var limit = Math.pow(2, z);
+
+      if (y < 0 || y >= limit)
+      {
+        return "404.png";
+      }
+      else
+      {
+        x = ((x % limit) + limit) % limit;
+        return this.url + z + "/" + x + "/" + y + "." + this.type;
+      }
+    }
+
+
+    //Initialise the 'map' object
+    function init()
+    {
+      map = new OpenLayers.Map ("map",
+      {
+        controls : [new OpenLayers.Control.Navigation(),
                     new OpenLayers.Control.PanZoomBar(),
                     new OpenLayers.Control.Attribution(),
                     new OpenLayers.Control.LayerSwitcher({'div': OpenLayers.Util.getElement('layerswitcher')})],
-                maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
-                maxResolution: 156543.0399,
-                numZoomLevels: 19,
-                units: 'm',
-                projection: new OpenLayers.Projection("EPSG:900913"),
-                displayProjection: new OpenLayers.Projection("EPSG:4326")
-            } );
+        maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
+        maxResolution: 156543.0399,
+        numZoomLevels: 19,
+        units: 'm',
+        projection: new OpenLayers.Projection("EPSG:900913"),
+        displayProjection: new OpenLayers.Projection("EPSG:4326")
+      });
 
-            var openTrackMap = new OpenLayers.Layer.OSM("OpenTrackMap", "tiles_hq/", {numZoomLevels: 18});
-            map.addLayer(openTrackMap);
+      var openTrackMap = new OpenLayers.Layer.OSM("OpenTrackMap", "tiles_hq/", {type: 'png', numZoomLevels: 18, getURL: getTileURL});
+      map.addLayer(openTrackMap);
 
-            // Define the map layer
-            // Note that we use a predefined layer that will be
-            // kept up to date with URL changes
-            // Here we define just one layer, but providing a choice
-            // of several layers is also quite simple
-            // Other defined layers are OpenLayers.Layer.OSM.Mapnik, OpenLayers.Layer.OSM.Maplint and OpenLayers.Layer.OSM.CycleMap
-            mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik");
-            map.addLayer(mapnik);
+      // Define the map layer
+      // Note that we use a predefined layer that will be
+      // kept up to date with URL changes
+      // Here we define just one layer, but providing a choice
+      // of several layers is also quite simple
+      // Other defined layers are OpenLayers.Layer.OSM.Mapnik, OpenLayers.Layer.OSM.Maplint and OpenLayers.Layer.OSM.CycleMap
+      mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik");
+      map.addLayer(mapnik);
  
-            if( ! map.getCenter() ){
-                var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
-                map.setCenter (lonLat, zoom);
-            }
-        }
- 
-    </script>
+      if( !map.getCenter())
+      {
+        var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
+        map.setCenter (lonLat, zoom);
+      }
+    }
+  </script>
 </head>
  

OpenTrackMap/usgs_srtm/srtm2contours.sh

@@ -6 +6 @@
   rm -f "${TILE%%.zip}" "${TILE%%.hgt.zip}.shp" "${TILE%%.hgt.zip}.shx" "${TILE%%.hgt.zip}.dbf"
 
-  echo "/home/blackhex/local/gdal/bin/gdal_contour -i 10 -snodata -32767 -a height ${TILE%%.hgt.zip}.tif ${TILE%%.hgt.zip}.shp"
-  /home/blackhex/local/Mapnik/bin/gdal_contour -i 10 -snodata -32767 -a height "${TILE%%.hgt.zip}.tif" "${TILE%%.hgt.zip}.shp"
+  echo "/home/blackhex/local/gdal/bin/gdal_contour -i 10 -snodata 32767 -a height ${TILE%%.hgt.zip}.tif ${TILE%%.hgt.zip}.shp"
+  /home/blackhex/local/Mapnik/bin/gdal_contour -i 10 -snodata 32767 -a height "${TILE%%.hgt.zip}.tif" "${TILE%%.hgt.zip}.shp"
   if [ "$CREATE" == "1" ]; then
     echo "/usr/lib/postgresql/8.4/bin/shp2pgsql -d -I -g way ${TILE%%.hgt.zip} contours | psql -q osm"

OpenTrackMap/usgs_srtm/srtm2shade.sh

@@ -5 +5 @@
 export LD_LIBRARY_PATH="${PREFIX}/lib"
 
-# for TILE in N*E*.hgt.zip; do
-#   yes | ./srtm_generate_hdr.sh ${TILE}
-#   rm -f "${TILE%%.hgt.zip}.bil" "${TILE%%.hgt.zip}.hdr" "${TILE%%.hgt.zip}.prj" "${TILE%%.hgt.zip}.hgt"
-# done
-# 
-# ${PREFIX}/bin/gdal_merge.py -v -o srtm.tif -ul_lr 12.10 51.06 18.87 48.55 N*E*.tif
-# ${PREFIX}/bin/gdalwarp -of GTiff -co "TILED=YES" -co "BIGTIFF=YES" -srcnodata 32767 -dstnodata 0 -t_srs "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgris=@null +no_defs" \
-#   -rcs -order 3 -tr 30 30 -wt Float32 -ot Float32 -wo SAMPLE_STEPS=100 -multi srtm.tif warped.tif
+for TILE in N*E*.hgt.zip; do
+  yes | ./srtm_generate_hdr.sh ${TILE}
+  rm -f "${TILE%%.hgt.zip}.bil" "${TILE%%.hgt.zip}.hdr" "${TILE%%.hgt.zip}.prj" "${TILE%%.hgt.zip}.hgt"
+done
+
+${PREFIX}/bin/gdal_merge.py -v -o srtm.tif -ul_lr 12.10 51.32 18.86 48.27 N*E*.tif
+${PREFIX}/bin/gdalwarp -of GTiff -co "TILED=YES" -co "BIGTIFF=YES" -srcnodata 32767 -dstnodata 0 -t_srs "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgris=@null +no_defs" \
+  -rcs -order 3 -tr 30 30 -wt Float32 -ot Float32 -wo SAMPLE_STEPS=100 -multi srtm.tif warped.tif
 ./hillshade warped.tif hillshade.tif -s 0.2

@@ -1 @@
-demtools
-osm2pgsql
 commit.sh