Changeset 3e83cb0 in osmose-backend


Ignore:
Timestamp:
Jan 31, 2015 7:41:11 PM (5 years ago)
Author:
Jocelyn Jaubert <jocelyn.jaubert@…>
Branches:
master
Children:
2b47cc1
Parents:
f820189 (diff), 897915d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Jocelyn Jaubert <jocelyn.jaubert@…> (31/01/2015 19:40:55)
git-committer:
Jocelyn Jaubert <jocelyn.jaubert@…> (31/01/2015 19:41:11)
Message:

Merge remote-tracking branch 'frodrigo/master'

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • osmose_config.py

    rf0c51d6 r897915d  
    486486default_country("africa", "ethiopia", 192800, {"country": "ET", "language": "en", "proj": 32638}) 
    487487default_country_simple("africa", "gabon", 192793,    {"country": "GA", "language": "fr", "proj": 32732}, download_repo=OSMFR) 
     488default_country("africa", "gambia", 192774, {"country": "GM", "language": "en", "proj": 32628}, download_repo=OSMFR) 
    488489default_country("africa", "ghana", 192781,    {"country": "GH", "language": "en", "proj": 32630}, download_repo=OSMFR) 
    489490default_country("africa", "guinea", 192778,   {"country": "GN", "language": "fr", "proj": 32628}, download_repo=OSMFR) 
     
    575576default_country("central-america", "saint_lucia", 550728, {"country": "LC", "driving_side": "left", "proj": 32620}, download_repo=OSMFR) 
    576577default_country("central-america", "saint_vincent_and_the_grenadines", 550725, {"country": "VC", "language": "en", "proj": 32620}, download_repo=OSMFR) 
    577 default_country("central-america", "united_kingdom_turks_and_caicos_islands", 547479, {"country": "TC", "language": "en", "proj": 32619}, download_repo=OSMFR, download_country="turks_and_caicos_islands") 
    578 default_country("central-america", "united_kingdom_cayman_islands", 2185366, {"country": "KY", "language": "en", "proj": 32617}, download_repo=OSMFR, download_country="cayman_islands") 
    579 default_country("central-america", "united_kingdom_anguilla", 2177161, {"country": "AI", "language": "en", "proj": 32620}, download_repo=OSMFR, download_country="anguilla") 
    580 default_country("central-america",  "united_kingdom_virgin_islands", 285454, {"country": "VG", "language": "en", "proj": 32620}, download_repo=OSMFR, download_country="british_virgin_islands") 
     578default_country("central-america", "saint_kitts_and_nevis", 536899, {"country": "KN", "language": "en","proj": 2005}, download_repo=OSMFR) 
     579default_country("central-america", "united_kingdom_anguilla", 2177161, {"country": "AI", "language": "en", "driving_side": "left", "proj": 32620}, download_repo=OSMFR, download_country="anguilla") 
     580default_country("central-america", "united_kingdom_cayman_islands", 2185366, {"country": "KY", "language": "en", "driving_side": "left", "proj": 32617}, download_repo=OSMFR, download_country="cayman_islands") 
     581default_country("central-america", "united_kingdom_montserrat", 537257, {"country": "MS", "language": "en", "driving_side": "left", "proj": 2005}, download_repo=OSMFR, download_country="montserrat") 
     582default_country("central-america", "united_kingdom_turks_and_caicos_islands", 547479, {"country": "TC", "language": "en", "driving_side": "left", "proj": 32619}, download_repo=OSMFR, download_country="turks_and_caicos_islands") 
     583default_country("central-america", "united_kingdom_virgin_islands", 285454, {"country": "VG", "language": "en", "driving_side": "left", "proj": 32620}, download_repo=OSMFR, download_country="british_virgin_islands") 
    581584default_country("central-america", "usa_puerto_rico", 4422604, {"country": "PR", "language": ["es", "en"], "proj": 32619}, download_repo=OSMFR, download_country="puerto_rico") 
     585default_country("central-america", "usa_virgin_islands", 286898, {"country": "VI", "language": "en", "proj": 4437}, download_repo=OSMFR, download_country="usa_virgin_islands") 
    582586 
    583587 
  • plugins/Name_Multiple.py

    rb720789 r8ba1dde  
    3838        # In West Virginia road are named like County Route 22/2 
    3939        self.routeSubNumber = self.father.config.options.get("country") in ('US', ) 
    40         self.routeSubNumberRe = re.compile(u"^.*(Route|Rt|Road) [0-9]+/[0-9]+$") 
     40        self.routeSubNumberRe = re.compile(u"^.*(Route|Rt|Road|Rd|Highway) [0-9]+/[0-9]+$") 
    4141 
    4242    def way(self, data, tags, nds): 
  • tools/generate-polygons.py

    r60e5972 rf820189  
    2020 
    2121  country_name = c.country 
    22   print "  ", country_name, c.polygon_id 
    2322 
    24   out_file = os.path.join("generated-polygons", country_name + ".poly") 
     23  if "poly" in c.download: 
     24    out_file = os.path.join("generated-polygons", c.download["poly"]) 
     25    if not os.path.exists(os.path.dirname(out_file)): 
     26      os.makedirs(os.path.dirname(out_file)) 
     27  else: 
     28    out_file = os.path.join("generated-polygons", country_name + ".poly") 
    2529  if os.path.exists(out_file): 
    2630    continue 
     31 
     32  print "  ", country_name, c.polygon_id 
    2733 
    2834  # generate relation boundary 
     
    4248    continue 
    4349 
    44   x = 0 
    45   y = 0.05 
    46   z = 0.1 
    47  
    4850  if not ("%s-%s-%s" % (x, y, z)) in r.text: 
    4951    r = requests.post(relation_generation_url, params={"id": c.polygon_id}, data={"x": x, "y": y, "z": z}) 
    5052 
    51 #  r = requests.get(polygon_union_url, params={"id": c.polygon_id, 
    52 #                                              "params": "%s-%s-%s" % (x,y,z)}) 
     53  r = requests.get(polygon_union_url, params={"id": c.polygon_id, 
     54                                              "params": "%s-%s-%s" % (x,y,z)}) 
    5355 
    54   out_file = os.path.join("generated-polygons", country_name + ".poly") 
    5556  with open(out_file, "w") as text_file: 
    56     text_file.write("toto") 
     57    text_file.write(r.content) 
Note: See TracChangeset for help on using the changeset viewer.