Changeset 4e13e8e in osmose-backend


Ignore:
Timestamp:
Sep 25, 2014 9:23:30 PM (5 years ago)
Author:
Jocelyn Jaubert <jocelyn.jaubert@…>
Branches:
master
Children:
efcddb7
Parents:
043ae80
git-author:
Frédéric Rodrigo <fred.rodrigo@…> (24/09/2014 20:41:29)
git-committer:
Jocelyn Jaubert <jocelyn.jaubert@…> (25/09/2014 21:23:30)
Message:

Move from default_country_simple to default_country when mapbox imagery available

File:
1 edited

Legend:

Unmodified
Added
Removed
  • osmose_config.py

    rd52d955 r4e13e8e  
    400400######################################################################### 
    401401 
    402 default_country_simple("africa", "algeria", 192756,  {"country": "DZ", "language": "ar", "proj": 32631}, download_repo=OSMFR) 
     402default_country("africa", "algeria", 192756,  {"country": "DZ", "language": "ar", "proj": 32631}, download_repo=OSMFR) 
    403403default_country_simple("africa", "angola", 195267, {"country": "AO", "language": "pt", "proj": 32733}, download_repo=OSMFR) 
    404 default_country_simple("africa", "benin", 192784,    {"country": "BJ", "language": "fr", "proj": 32631}, download_repo=OSMFR) 
    405 default_country_simple("africa", "botswana", 1889339, {"country": "BW", "language": "en", "driving_side": "left", "proj": 32734}) 
    406 default_country_simple("africa", "burkina_faso", 192783, {"country": "BF", "language": "fr", "proj": 32630}, download_repo=OSMFR) 
    407 default_country_simple("africa", "burundi", 195269,  {"country": "BI", "proj": 32735}, download_repo=OSMFR) 
     404default_country("africa", "benin", 192784,    {"country": "BJ", "language": "fr", "proj": 32631}, download_repo=OSMFR) 
     405default_country("africa", "botswana", 1889339, {"country": "BW", "language": "en", "driving_side": "left", "proj": 32734}) 
     406default_country("africa", "burkina_faso", 192783, {"country": "BF", "language": "fr", "proj": 32630}, download_repo=OSMFR) 
     407default_country("africa", "burundi", 195269,  {"country": "BI", "proj": 32735}, download_repo=OSMFR) 
    408408default_country_simple("africa", "cameroon", 192830, {"country": "CM", "proj": 32632}, download_repo=OSMFR) 
    409409default_country_simple("africa", "cape_verde", 535774, {"country": "CV", "language": "pt", "proj": 32626}, download_repo=OSMFR) 
    410 default_country_simple("africa", "central_african_republic", 192790, {"country": "CF", "proj": 32634}, download_repo=OSMFR) 
     410default_country("africa", "central_african_republic", 192790, {"country": "CF", "proj": 32634}, download_repo=OSMFR) 
    411411default_country_simple("africa", "chad", 2361304,    {"country": "TD", "proj": 32634}, download_repo=OSMFR) 
    412412default_country_simple("africa", "comoros", 535790, {"country": "KM", "proj": 32738}, download_repo=OSMFR) 
    413 default_country_simple("africa", "congo_brazzaville", 192794, {"country": "CG", "proj": 32733}, download_repo=OSMFR) 
    414 default_country_simple("africa", "congo_kinshasa", 192795, {"country": "CD", "proj": 32734}, download_repo=OSMFR) 
     413default_country("africa", "congo_brazzaville", 192794, {"country": "CG", "proj": 32733}, download_repo=OSMFR) 
     414default_country("africa", "congo_kinshasa", 192795, {"country": "CD", "proj": 32734}, download_repo=OSMFR) 
    415415default_country_simple("africa", "djibouti", 192801, {"country": "DJ", "language": "fr", "proj": 32638}, download_repo=OSMFR) 
    416 default_country_simple("africa", "egypt", 1473947,   {"country": "EG", "language": "ar", "proj": 32635}) 
     416default_country("africa", "egypt", 1473947,   {"country": "EG", "language": "ar", "proj": 32635}) 
    417417default_country_simple("africa", "equatorial_guinea", 192791, {"country": "GQ", "language": "es", "proj": 32732}, download_repo=OSMFR) 
    418418default_country_simple("africa", "eritrea", 296961, {"country": "ER", "proj": 32637}, download_repo=OSMFR) 
    419 default_country_simple("africa", "ethiopia", 192800, {"country": "ET", "language": "am", "proj": 32638}) 
     419default_country("africa", "ethiopia", 192800, {"country": "ET", "language": "am", "proj": 32638}) 
    420420default_country_simple("africa", "gabon", 192793,    {"country": "GA", "language": "fr", "proj": 32732}, download_repo=OSMFR) 
    421 default_country_simple("africa", "ghana", 192781,    {"country": "GH", "language": "en", "proj": 32630}, download_repo=OSMFR) 
    422 default_country_simple("africa", "guinea", 192778,   {"country": "GN", "language": "fr", "proj": 32628}, download_repo=OSMFR) 
    423 default_country_simple("africa", "guinea_bissau", 192776, {"country": "GW", "language": "pt", "proj": 32628}, download_country="guinea-bissau") 
    424 default_country_simple("africa", "ivory_coast", 192779, {"country": "CI", "language": "fr", "proj": 32630}, download_repo=OSMFR) 
     421default_country("africa", "ghana", 192781,    {"country": "GH", "language": "en", "proj": 32630}, download_repo=OSMFR) 
     422default_country("africa", "guinea", 192778,   {"country": "GN", "language": "fr", "proj": 32628}, download_repo=OSMFR) 
     423default_country("africa", "guinea_bissau", 192776, {"country": "GW", "language": "pt", "proj": 32628}, download_country="guinea-bissau") 
     424default_country("africa", "ivory_coast", 192779, {"country": "CI", "language": "fr", "proj": 32630}, download_repo=OSMFR) 
    425425default_country_simple("africa", "kenya", 192798,    {"country": "KE", "driving_side": "left", "proj": 32737}, download_repo=OSMFR) 
    426426default_country_simple("africa", "lesotho", 2093234, {"country": "LS", "driving_side": "left", "proj": 32735}, download_repo=OSMFR) 
    427427default_country_simple("africa", "liberia", 192780,  {"country": "LR", "language": "en", "proj": 32629}) 
    428 default_country_simple("africa", "libya", 192758,    {"country": "LY", "language": "ar", "proj": 32633}) 
     428default_country("africa", "libya", 192758,    {"country": "LY", "language": "ar", "proj": 32633}) 
    429429default_country_simple("africa", "madagascar", 447325, {"country": "MG", "language": "fr", "proj": 32738}, download_repo=GEOFABRIK) 
    430430default_country_simple("africa", "malawi", 195290, {"country": "MW", "driving_side": "left", "proj": 32736}, download_repo=OSMFR) 
    431431default_country_simple("africa", "mali", 192785,     {"country": "ML", "language": "fr", "proj": 32630}, download_repo=OSMFR) 
    432 default_country_simple("africa", "mauritania", 192763, {"country": "MR", "proj": 32628}, download_repo=OSMFR) 
     432default_country("africa", "mauritania", 192763, {"country": "MR", "proj": 32628}, download_repo=OSMFR) 
    433433default_country_simple("africa", "mauritius", 535828, {"country": "MU", "driving_side": "left", "proj": 32740}, download_repo=OSMFR) 
    434 default_country_simple("africa", "morocco", 3630439,  {"country": "MA", "language": "ar", "proj": 32629}) 
     434default_country("africa", "morocco", 3630439,  {"country": "MA", "language": "ar", "proj": 32629}) 
    435435default_country_simple("africa", "mozambique", 195273, {"country": "MZ", "language": "pt", "driving_side": "left", "proj": 32736}, download_repo=OSMFR) 
    436436default_country_simple("africa", "namibia", 195266, {"country": "NA", "language": "en", "driving_side": "left", "proj": 32733}, download_repo=OSMFR) 
    437 default_country_simple("africa", "niger", 192786,    {"country": "NE", "language": "fr", "proj": 32632}, download_repo=OSMFR) 
    438 default_country_simple("africa", "nigeria", 192787,  {"country": "NG", "language": "en", "proj": 32633}) 
     437default_country("africa", "niger", 192786,    {"country": "NE", "language": "fr", "proj": 32632}, download_repo=OSMFR) 
     438default_country("africa", "nigeria", 192787,  {"country": "NG", "language": "en", "proj": 32633}) 
    439439default_country_simple("africa", "rwanda", 171496, {"country": "RW", "proj": 32735}, download_repo=OSMFR) 
    440440default_country_simple("africa", "sao_tome_and_principe", 535880, {"country": "ST", "proj": 32632}, download_repo=OSMFR) 
    441441default_country_simple("africa", "senegal", 192775,  {"country": "SN", "proj": 32628}, download_repo=OSMFR) 
    442442default_country_simple("africa", "seychelles", 536765, {"country": "SC", "driving_side": "left", "proj": 32739}, download_repo=OSMFR) 
    443 default_country_simple("africa", "sierra_leone", 192777, {"country": "SL", "language": "en", "proj": 32629}) 
    444 default_country_simple("africa", "somalia", 192799,  {"country": "SO", "language": "so", "proj": 32638}) 
     443default_country("africa", "sierra_leone", 192777, {"country": "SL", "language": "en", "proj": 32629}) 
     444default_country("africa", "somalia", 192799,  {"country": "SO", "language": "so", "proj": 32638}) 
    445445default_country_simple("africa", "south_africa", 87565, {"country": "ZA", "driving_side": "left", "proj": 32735}, download_repo=OSMFR) 
    446446default_country_simple("africa", "south_sudan", 1656678, {"country": "SS", "language": "en", "proj": 32635}, download_repo=OSMFR) 
    447447default_country_simple("africa", "sudan", 192789, {"country": "SD", "proj": 32636}, download_repo=OSMFR) 
    448448default_country_simple("africa", "swaziland", 88210, {"country": "SZ", "driving_side": "left", "proj": 32736}, download_repo=OSMFR) 
    449 default_country_simple("africa", "tanzania", 195270, {"country": "TZ", "driving_side": "left", "proj": 32736}) 
     449default_country("africa", "tanzania", 195270, {"country": "TZ", "driving_side": "left", "proj": 32736}) 
    450450default_country_simple("africa", "togo", 192782,     {"country": "TG", "language": "fr", "proj": 32631}, download_repo=OSMFR) 
    451 default_country_simple("africa", "tunisia", 192757,  {"country": "TN", "language": "ar", "proj": 32632}, download_repo=OSMFR) 
     451default_country("africa", "tunisia", 192757,  {"country": "TN", "language": "ar", "proj": 32632}, download_repo=OSMFR) 
    452452default_country_simple("africa", "uganda", 192796, {"country": "UG", "driving_side": "left", "proj": 32636}, download_repo=OSMFR) 
    453 default_country_simple("africa", "western_sahara", 2559126, {"proj": 32629}, download_repo=OSMFR) 
     453default_country("africa", "western_sahara", 2559126, {"proj": 32629}, download_repo=OSMFR) 
    454454default_country_simple("africa", "zambia", 195271, {"country": "ZM", "language": "en", "driving_side": "left", "proj": 32736}, download_repo=OSMFR) 
    455455default_country_simple("africa", "zimbabwe", 195272, {"country": "ZW", "driving_side": "left", "proj": 32736}, download_repo=OSMFR) 
     
    509509######################################################################### 
    510510 
    511 default_country_simple("south-america", "argentina", 286393, {"country": "AR", "language": "es", "proj": 32720}) 
    512 default_country_simple("south-america", "bolivia", 252645, {"country": "BO", "language": "es", "proj": 32720}) 
    513 default_country_simple("south-america", "brazil", 59470, {"country": "BR", "language": "pt", "proj": 32722}) 
    514 default_country_simple("south-america", "chile", 167454, {"country": "CL", "language": "es", "proj": 32718}) 
    515 default_country_simple("south-america", "colombia", 120027, {"country": "CO", "language": "es", "proj": 32618}) 
    516 default_country_simple("south-america", "ecuador", 108089, {"country": "EC", "language": "es", "proj": 32727}) 
     511default_country("south-america", "argentina", 286393, {"country": "AR", "language": "es", "proj": 32720}) 
     512default_country("south-america", "bolivia", 252645, {"country": "BO", "language": "es", "proj": 32720}) 
     513default_country("south-america", "brazil", 59470, {"country": "BR", "language": "pt", "proj": 32722}) 
     514default_country("south-america", "chile", 167454, {"country": "CL", "language": "es", "proj": 32718}) 
     515default_country("south-america", "colombia", 120027, {"country": "CO", "language": "es", "proj": 32618}) 
     516default_country("south-america", "ecuador", 108089, {"country": "EC", "language": "es", "proj": 32727}) 
    517517default_country_simple("south-america", "guyana", 287083, {"country": "GY", "language": "en", "driving_side": "left", "proj": 32621}, download_repo=OSMFR) 
    518 default_country_simple("south-america", "paraguay", 287077, {"country": "PY", "language": "es", "proj": 32721}, download_repo=OSMFR) 
    519 default_country_simple("south-america", "peru", 288247, {"country": "PE", "language": "es", "proj": 32718}) 
     518default_country("south-america", "paraguay", 287077, {"country": "PY", "language": "es", "proj": 32721}, download_repo=OSMFR) 
     519default_country("south-america", "peru", 288247, {"country": "PE", "language": "es", "proj": 32718}) 
    520520default_country_simple("south-america", "suriname", 287082, {"country": "SR", "language": "nl", "proj": 32621}, download_repo=OSMFR) 
    521 default_country_simple("south-america", "uruguay", 287072, {"country": "UY", "language": "es", "proj": 32721}) 
    522 default_country_simple("south-america", "venezuela", 272644, {"country": "VE", "language": "es", "proj": 32620}, download_repo=OSMFR) 
     521default_country("south-america", "uruguay", 287072, {"country": "UY", "language": "es", "proj": 32721}) 
     522default_country("south-america", "venezuela", 272644, {"country": "VE", "language": "es", "proj": 32620}, download_repo=OSMFR) 
    523523 
    524524######################################################################### 
Note: See TracChangeset for help on using the changeset viewer.