Show
Ignore:
Timestamp:
06/29/08 06:56:29 (6 months ago)
Author:
artem
Message:

reverting back to 700

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/include/mapnik/map.hpp

    r701 r702  
    3838    class MAPNIK_DECL Map 
    3939    {    
    40     public: 
    41  
    42         enum aspect_fix_mode  
    43         { 
    44             /* grow the width or height of the specified geo bbox to fill the map size. default behaviour. */ 
    45             GROW_BBOX, 
    46             /* grow the width or height of the map to accomodate the specified geo bbox. */ 
    47             GROW_CANVAS, 
    48             /* shrink the width or height of the specified geo bbox to fill the map size. */ 
    49             SHRINK_BBOX, 
    50             /* shrink the width or height of the map to accomodate the specified geo bbox. */ 
    51             SHRINK_CANVAS, 
    52             /* adjust the width of the specified geo bbox, leave height and map size unchanged */ 
    53             ADJUST_BBOX_WIDTH, 
    54             /* adjust the height of the specified geo bbox, leave width and map size unchanged */ 
    55             ADJUST_BBOX_HEIGHT, 
    56             /* adjust the width of the map, leave height and geo bbox unchanged */ 
    57             ADJUST_CANVAS_WIDTH, 
    58             /* adjust the height of the map, leave width and geo bbox unchanged */ 
    59             ADJUST_CANVAS_HEIGHT 
    60         }; 
    61     private: 
    6240        static const unsigned MIN_MAPSIZE=16; 
    6341        static const unsigned MAX_MAPSIZE=MIN_MAPSIZE<<10; 
    … …  
    6745        boost::optional<Color> background_; 
    6846        std::map<std::string,feature_type_style> styles_; 
    69         std::map<std::string,FontSet> fontsets_; 
    7047        std::vector<Layer> layers_; 
    7148        Envelope<double> currentExtent_; 
    72         aspect_fix_mode aspectFixMode_; 
    7349         
    7450    public: 
    75  
    7651        typedef std::map<std::string,feature_type_style>::const_iterator const_style_iterator; 
    7752        typedef std::map<std::string,feature_type_style>::iterator style_iterator; 
    … …  
    155130        feature_type_style const& find_style(std::string const& name) const; 
    156131 
    157         /*! \brief Insert a fontset into the map. 
    158          *  @param name The name of the fontset. 
    159          *  @param style The fontset to insert. 
    160          *  @return true If success. 
    161          *  @return false If failure. 
    162          */ 
    163         bool insert_fontset(std::string const& name, FontSet const& fontset); 
    164         
    165         /*! \brief Find a fontset. 
    166          *  @param name The name of the fontset. 
    167          *  @return The fontset if found. If not found return the default map fontset. 
    168          */ 
    169         FontSet const& find_fontset(std::string const& name) const; 
    170  
    171132        /*! \brief Get number of all layers. 
    172133         */ 
    … …  
    283244        featureset_ptr query_map_point(unsigned index, double x, double y) const; 
    284245        ~Map(); 
    285  
    286         void setAspectFixMode(aspect_fix_mode afm) { aspectFixMode_ = afm; } 
    287         bool getAspectFixMode() { return aspectFixMode_; } 
    288  
    289246    private: 
    290247        void fixAspectRatio();