Add:Core:Made possibility to specify min and max zoom

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@2870 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/attr_def.h b/navit/attr_def.h
index cd9ca4b..342a523 100644 (file)
--- a/navit/attr_def.h
+++ b/navit/attr_def.h
@@ -130,6 +130,8 @@ ATTR(flags_street)
 ATTR(flags_house_number)
 ATTR(use_camera)
 ATTR(flags_graphics)
+ATTR(zoom_min)
+ATTR(zoom_max)
 ATTR2(0x00027500,type_rel_abs_begin)
 /* These attributes are int that can either hold relative              *
  * or absolute values. A relative value is indicated by                *

diff --git a/navit/navit.c b/navit/navit.c
index 73975b4..ca43024 100644 (file)
--- a/navit/navit.c
+++ b/navit/navit.c
@@ -137,6 +137,7 @@ struct navit {
        int follow_cursor;
        int prevTs;
        int graphics_flags;
+       int zoom_min, zoom_max;
 };
 
 struct gui *main_loop_gui;
@@ -502,6 +503,10 @@ static void
 navit_scale(struct navit *this_, long scale, struct point *p, int draw)
 {
        struct coord c1, c2, *center;
+       if (scale < this_->zoom_min)
+               scale=this_->zoom_min;
+       if (scale > this_->zoom_max)
+               scale=this_->zoom_max;
        if (p)
                transform_reverse(this_->trans, p, &c1);
        transform_set_scale(this_->trans, scale);
@@ -661,6 +666,8 @@ navit_new(struct attr *parent, struct attr **attrs)
        this_->autozoom_secs = 10;
        this_->autozoom_min = 7;
        this_->autozoom_active = 0;
+       this_->zoom_min = 1;
+       this_->zoom_max = 2097152;
        this_->follow_cursor = 1;
 
        this_->trans = transform_new();
@@ -1768,6 +1775,14 @@ navit_set_attr_do(struct navit *this_, struct attr *attr, int init)
                if (attr_updated && !init) 
                        navit_draw(this_);
                break;
+       case attr_zoom_min:
+               attr_updated=(attr->u.num != this_->zoom_min);
+               this_->zoom_min=attr->u.num;
+               break;
+       case attr_zoom_max:
+               attr_updated=(attr->u.num != this_->zoom_max);
+               this_->zoom_max=attr->u.num;
+               break;
        case attr_message:
                navit_add_message(this_, attr->u.str);
                break;