Changeset 36386

Timestamp:

Mar 15, 2009, 12:44:11 PM (15 years ago)

Author:

marisn

Message:

Prevent gis.m from complete failure in Lat/Lon locations

File:

• grass/branches/develbranch_6/gui/tcltk/gis.m/mapcanvas.tcl (modified) (5 diffs)

grass/branches/develbranch_6/gui/tcltk/gis.m/mapcanvas.tcl

@@ -113 +113 @@
         variable zoom_attrs
         set zoom_attrs {n s e w nsres ewres rows cols}
+        variable ll_proj ;# 1 if it's Lat/Lon projection, 0 othervise
 
         # string with region information to show in status bar
@@ -418 +419 @@
 
 proc MapCanvas::get_mapunits {} {
+        variable ll_proj
         # get map units from PROJ_UNITS
         if {![catch {open "|g.proj -p" r} input]} {
@@ -444 +446 @@
         }
         
+        set ll_proj 0
+        if { [string eq "Lat/Lon" "$prj(name)"] } {
+                set ll_proj 1
+        }
+        
         return $mapunits
 }
@@ -1030 +1037 @@
         variable canvas_w
         variable canvas_h
+        variable ll_proj
 
         set mapunits [MapCanvas::get_mapunits]
@@ -1045 +1053 @@
                 # Set the region extents to the smallest region no smaller than the canvas
                 set canvas_ar [expr {1.0 * $canvas_w($mon) / $canvas_h($mon)}]
-                set expanded_region [MapCanvas::shrinkwrap 1 [lrange $region 0 3] $canvas_ar]
-                foreach {n s e w} $expanded_region {break}
+                foreach {n s e w} [MapCanvas::shrinkwrap 1 [lrange $region 0 3] $canvas_ar] {break}
+                # In Lat/Lon N and S can not be larger than 90!
+                if { $ll_proj } {
+                        if { $n >  90 } { set n  90 }
+                        if { $s < -90 } { set s -90 }
+                }
+                set expanded_region "$n $s $e $w"
                 # Calculate the resolutions proportional to the map size
                 set explore_nsres [expr {1.0 * ($n - $s) / $canvas_h($mon)}]