Changeset 67d7345 in osmose-backend


Ignore:
Timestamp:
Feb 21, 2013 7:38:47 PM (7 years ago)
Author:
Jocelyn Jaubert <jocelyn.jaubert@…>
Branches:
master
Children:
16954ba
Parents:
8a6e4c6 (diff), 60b339b (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.
Message:

Merge remote-tracking branch 'frodrigo/master'

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • analysers/analyser_osmosis_useless.py

    r1b999dc r60b339b  
    8080        self.callback10 = lambda res: {"class":1, "data":[self.node_full, self.relation_full, self.positionAsText]} 
    8181        self.callback20 = lambda res: {"class":2, "data":[self.way_full, self.relation_full if res[1] else None, self.positionAsText]} 
    82         self.callback20 = lambda res: {"class":3, "data":[self.relation_full, self.relation_full if res[1] else None, self.positionAsText]} 
     82        self.callback30 = lambda res: {"class":3, "data":[self.relation_full, self.relation_full if res[1] else None, self.positionAsText]} 
    8383 
    8484    def analyser_osmosis_all(self): 
    8585        self.run(sql10.format("", ""), self.callback10) 
    8686        self.run(sql20.format("", ""), self.callback20) 
    87         self.run(sql30.format("", ""), self.callback20) 
     87        self.run(sql30.format("", ""), self.callback30) 
    8888 
    8989    def analyser_osmosis_touched(self): 
  • analysers/analyser_osmosis_highway_link.py

    r16fe5c3 r8a6e4c6  
    113113    def __init__(self, config, logger = None): 
    114114        Analyser_Osmosis.__init__(self, config, logger) 
    115         self.classs[1] = {"item":"1110", "level": 1, "tag": ["highway"], "desc":{"fr":"Highway *_link non corespondant", "en":"Bad *_link highway"} } 
    116         self.classs_change[2] = {"item":"1110", "level": 1, "tag": ["highway"], "desc":{"fr":"Highway trop long pour un *_link", "en":"Highway too lonf for a *_link"} } 
     115        self.classs[1] = {"item":"1110", "level": 1, "tag": ["highway"], "desc":{"fr":"Highway *_link non correspondant", "en":"Bad *_link highway"} } 
     116        self.classs_change[2] = {"item":"1110", "level": 1, "tag": ["highway"], "desc":{"fr":"Highway trop long pour un *_link", "en":"Highway too long for a *_link"} } 
    117117        self.callback40 = lambda res: {"class":2, "data":[self.way_full, self.positionAsText]} 
    118118 
  • osmose_run.py

    rd08d323 r3ca23bd  
    444444                                                        ('source', tmp_src), 
    445445                                                        ('code', password)]) 
    446                             fd = urllib2.urlopen(tmp_req, tmp_dat) 
     446                            fd = urllib2.urlopen(tmp_req, tmp_dat, timeout=240) 
    447447                            dt = fd.read().decode("utf8").strip() 
    448448                            if dt[-2:] <> "OK": 
Note: See TracChangeset for help on using the changeset viewer.