Changeset da788c3 in osmose-backend


Ignore:
Timestamp:
Jan 9, 2015 8:59:38 PM (5 years ago)
Author:
Frédéric Rodrigo <fred.rodrigo@…>
Branches:
master
Children:
9c3ed58
Parents:
5fc827c
git-author:
Frédéric Rodrigo <fred.rodrigo@…> (03/01/2015 16:09:05)
git-committer:
Frédéric Rodrigo <fred.rodrigo@…> (09/01/2015 20:59:38)
Message:

Factorize replace in country name in config

File:
1 edited

Legend:

Unmodified
Added
Removed
  • osmose_config.py

    r5fc827c rda788c3  
    160160                 download_repo=GEOFABRIK, download_country=None): 
    161161 
     162        country = country.replace("-", "_") 
    162163        template_config.__init__(self, country, polygon_id, analyser_options, download_repo) 
    163164        if not download_country: 
     
    232233                 download_repo=GEOFABRIK, download_country=None): 
    233234 
    234         country = "france_" + region.replace("-", "_") 
     235        country = "france_" + region 
    235236        default_country_fr.__init__(self, part, country, polygon_id, proj, analyser_options, 
    236237                                    download_repo, download_country) 
     
    569570                 download_repo=FMACH, download_country=None): 
    570571 
    571         country = "italy_" + region.replace("-", "_") 
     572        country = "italy_" + region 
    572573        default_country_it.__init__(self, part, country, polygon_id, proj, analyser_options, 
    573574                                    download_repo, download_country) 
     
    605606 
    606607        download_country = province.replace("-", "_") 
    607         country = "netherlands_" + province.replace("-", "_") 
     608        country = "netherlands_" + province 
    608609        _analyser_options = {"country": "NL", "language": "nl", "proj": proj} 
    609610        _analyser_options.update(analyser_options) 
     
    638639        part = "europe" 
    639640        download_country = "czech_republic/" + kraj.replace("-", "_") 
    640         country = "czech_republic_" + kraj.replace("-", "_") 
     641        country = "czech_republic_" + kraj 
    641642        if not analyser_options: 
    642643            analyser_options = {} 
     
    668669        part = "europe" 
    669670        download_country = "poland/" + province.replace("-", "_") 
    670         country = "poland_" + province.replace("-", "_") 
     671        country = "poland_" + province 
    671672        if not analyser_options: 
    672673            analyser_options = {} 
     
    700701        part = "europe" 
    701702        download_country = "germany/" + province 
    702         country = "germany_" + province.replace("-", "_") 
     703        country = "germany_" + province 
    703704        if not analyser_options: 
    704705            analyser_options = {} 
Note: See TracChangeset for help on using the changeset viewer.