Merge branch 'master' of git.rrze.uni-erlangen.de:osmrrze

diff --git a/cgis/staticmap.php b/cgis/staticmap.php
index d4094cd8969235834b786ff0162f62ab28f9998e..a721c3e0b1a149aa426f7229a1d23e74d202c974 100755 (executable)
--- a/cgis/staticmap.php
+++ b/cgis/staticmap.php
@@ -37,7 +37,9 @@ Class staticMapLite {
 
        protected $tileSize = 256;
        protected $tileSrcUrl = array(  'osmorg' => 'http://osm.rrze.fau.de/tiles/{Z}/{X}/{Y}.png',
-                                        'osmde' => 'http://osm.rrze.fau.de/osmde/{Z}/{X}/{Y}.png'
+                                        'osmde' => 'http://osm.rrze.fau.de/osmde/{Z}/{X}/{Y}.png',
+                                        'osmorglowzoom' => 'http://osm.rrze.fau.de/lowzoom/{Z}/{X}/{Y}.png',
+                                        'luftbilderl' => 'http://osm.rrze.fau.de/luftbilderl/{Z}/{X}/{Y}.png'
                                     );
        
        protected $tileDefaultSrc = 'osmde';

diff --git a/scripts/osmbuildings-json-generator.pl b/scripts/osmbuildings-json-generator.pl
index a9b28f42efcde8bc13c3f976b1b802cd80c12b37..3a39357550c2fe6aadb9e8acbf1ae7b01af0cd65 100755 (executable)
--- a/scripts/osmbuildings-json-generator.pl
+++ b/scripts/osmbuildings-json-generator.pl
@@ -177,7 +177,7 @@ foreach $xtable ('planet_osm_polygon1', 'planet_osm_polygon2', 'planet_osm_line'
     exit(1);
   }
   my $sth2 = $dbh->prepare("select ST_X(points) as x, ST_Y(points) as y"
-                         . " from (select ST_astext((ST_dumppoints(ST_transform(?, 4326))).geom) as points) as points");
+                         . " from (select ST_astext((ST_dumppoints(ST_transform(geometry(?), 4326))).geom) as points) as points");
   my $sth4 = $dbh->prepare("select (ST_dumprings(?)).geom as rings");
   while ($row = $sth->fetchrow_hashref()) {
     if ($xtable eq 'planet_osm_polygon1') {