fix count from query if needed

[google-map-tiles.git] / tiles.pl

diff --git a/tiles.pl b/tiles.pl
index a8d6998..31f8fec 100755 (executable)
--- a/tiles.pl
+++ b/tiles.pl
@@ -69,10 +69,12 @@ if ( !(-e $icon1) or !(-e $icon2))                                  # Icon file missing - bad thing
 
 # (35,-89),(34,-90)
 
-$dbh->do("drop table gvp_world_tiles") ;
+eval { $dbh->do("drop table gvp_world_tiles") };
 $dbh->do("create table gvp_world_tiles (zoom int2,tilex int4,tiley int4,latpix int4,lngpix int4)") ;
 
-$sth = $dbh->prepare("select (volpnt)[0] as lat, (volpnt)[1] as lng from gvp_world") ;
+my $sql = "select (volpnt)[0] as lat, (volpnt)[1] as lng from gvp_world" ;
+$sql    = "select (point)[0]  as lat, (point) [1] as lng from geo_count" if $name =~ m/koha/;
+$sth = $dbh->prepare( $sql );
 
 $sth->execute ;
 
@@ -183,6 +185,9 @@ while ( ($zoom,$tilex,$tiley) = $sth->fetchrow_array )
   $imicon = $imicon1 ;
  }
 
+ my $custom_icon = "$name/icons/$zoom.png";
+ $imicon = GD::Image->newFromPng( $custom_icon ) if -e $custom_icon;
+
  $sti = $dbh->prepare("select latpix,lngpix from gvp_world_tiles where zoom = $zoom and tilex = $tilex and tiley = $tiley") ;
 
  $sti->execute ;