Changeset 61f45f4 in osmose-backend


Ignore:
Timestamp:
Jan 1, 2015 7:36:38 PM (5 years ago)
Author:
Jocelyn Jaubert <jocelyn.jaubert@…>
Branches:
master
Children:
412d566, 01981eb
Parents:
bcbc6b9 (diff), ea15278 (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:
2 added
3 edited
3 moved

Legend:

Unmodified
Added
Removed
  • analysers/analyser_merge_library_FR_aquitaine.py

    r2c0f5b8 r952ae8e  
    2424 
    2525 
    26 class Analyser_Merge_Library_FR_aquitiane(Analyser_Merge): 
     26class Analyser_Merge_Library_FR_aquitaine(Analyser_Merge): 
    2727    def __init__(self, config, logger = None): 
    2828        self.missing_official = {"item":"8230", "class": 1, "level": 3, "tag": ["merge", "amenity"], "desc": T_(u"Library not integrated") } 
     
    3232                url = "http://www.sirtaqui-aquitaine.com", 
    3333                name = u"Liste des bibliothèques et médiathèques en Aquitaine", 
    34                 file = "library_FR_aquitiane.csv.bz2", 
     34                file = "library_FR_aquitaine.csv.bz2", 
    3535                encoding = "ISO-8859-15", 
    3636                csv = CSV(separator = ";")), 
    37             Load("LONGITUDE", "LATITUDE", table = "library_FR_aquitiane", 
     37            Load("LONGITUDE", "LATITUDE", table = "library_FR_aquitaine", 
    3838                where = lambda row: u"Bibliothèque" in row["NOM_OFFRE"] or u"Médiathèque" in row["NOM_OFFRE"]), 
    3939            Mapping( 
  • analysers/analyser_merge_winery_FR_aquitaine.py

    r2c0f5b8 r952ae8e  
    2424 
    2525 
    26 class Analyser_Merge_Winery_FR_aquitiane(Analyser_Merge): 
     26class Analyser_Merge_Winery_FR_aquitaine(Analyser_Merge): 
    2727    def __init__(self, config, logger = None): 
    2828        self.missing_official = {"item":"8240", "class": 1, "level": 3, "tag": ["merge", "amenity"], "desc": T_(u"Winery not integrated") } 
     
    3535                encoding = "ISO-8859-15", 
    3636                csv = CSV(separator = ";")), 
    37             Load("LONGITUDE", "LATITUDE", table = "winery_FR_aquitiane", 
     37            Load("LONGITUDE", "LATITUDE", table = "winery_FR_aquitaine", 
    3838                where = lambda row: u"roducteur" in row["NOM_OFFRE"] or u"Coopérative" in row["NOM_OFFRE"]), 
    3939            Mapping( 
  • osmose_config.py

    rbcbc6b9 r61f45f4  
    328328france_local_db.analyser["merge_pharmacy_FR"] = "xxx" 
    329329france_local_db.analyser["merge_postal_code_FR"] = "xxx" 
    330 france_local_db.analyser["merge_library_FR_aquitiane"] = "xxx" 
    331 france_local_db.analyser["merge_winery_FR_aquitiane"] = "xxx" 
     330france_local_db.analyser["merge_library_FR_aquitaine"] = "xxx" 
     331france_local_db.analyser["merge_winery_FR_aquitaine"] = "xxx" 
     332france_local_db.analyser["merge_restaurant_FR_aquitaine"] = "xxx" 
     333france_local_db.analyser["merge_restaurant_FR_cg71"] = "xxx" 
    332334 
    333335######################################################################### 
     
    547549 
    548550class default_country_it(default_country): 
    549     def __init__(self, part, country, polygon_id=None, proj=None, analyser_options=None, 
     551    def __init__(self, part, country, polygon_id=None, proj=None, analyser_options={}, 
    550552                 download_repo=FMACH, download_country=None): 
    551553 
    552         if not analyser_options: 
    553             analyser_options = {} 
    554         analyser_options.update({"country": "IT", "language": "it", "proj": proj}) 
    555         default_country.__init__(self, part, country, polygon_id, analyser_options, 
     554        _analyser_options = {"country": "IT", "language": "it", "proj": proj} 
     555        _analyser_options.update(analyser_options) 
     556        default_country.__init__(self, part, country, polygon_id, _analyser_options, 
    556557                                        download_repo, download_country) 
    557558 
    558559 
    559560class italy_region(default_country_it): 
    560     def __init__(self, part, region, polygon_id=None, proj=23032, analyser_options=None, 
     561    def __init__(self, part, region, polygon_id=None, proj=23032, analyser_options={}, 
    561562                 download_repo=FMACH, download_country=None): 
    562563 
     
    584585italy_region("gfoss_geodata/osm/output_osm_regioni/", "sicilia", 39152) 
    585586italy_region("gfoss_geodata/osm/output_osm_regioni/", "toscana", 41977) 
    586 italy_region("gfoss_geodata/osm/output_osm_regioni/", "trentino-alto-adige", 45757) 
     587italy_region("gfoss_geodata/osm/output_osm_regioni/", "trentino-alto-adige", 45757, analyser_options={"language": ["it","de"]}) 
    587588italy_region("gfoss_geodata/osm/output_osm_regioni/", "umbria", 42004) 
    588589italy_region("gfoss_geodata/osm/output_osm_regioni/", "valle-aosta", 2905554) 
  • plugins/Number.py

    r51d281f r429ec7b  
    2929        self.errors[3091] = { "item": 3091, "level": 2, "tag": ["value", "fix:chair"], "desc": T_(u"Numerical value") } 
    3030        self.tag_number = ["height", "maxheight", "maxheight:physical", "width", "maxwidth", "length", "maxlength", "maxweight", "maxspeed", "population", "admin_level", "ele"] 
    31         self.Number = re.compile(u"^((?:[0-9]+(?:[.][0-9]+)?)|(?:[.][0-9]+))(?: ?(?:m|ft|cm|km|lbs|tons|t|T|mph|knots))?$") 
     31        self.Number = re.compile(u"^((?:[0-9]+(?:[.][0-9]+)?)|(?:[.][0-9]+))(?: ?(?:m|ft|cm|km|lbs|tons|t|T|mph|knots)|'(?:[0-9]*(?:[.][0-9]+)?\")?|\")?$") 
    3232        self.MaxspeedExtraValue = ["none", "signals", "national", "no", "unposted", "walk", "urban", "variable"] 
    3333        self.MaxspeedClassValue = re.compile(u'^[A-Z]*:.*$') 
     
    6060        a = Number(None) 
    6161        a.init(None) 
    62         for d in ["194", "14 m", "0.6m", "18ft", "1cm", "narrow", "8 km", "400m", "14ft"]: 
     62        for d in ["194", "14 m", "0.6m", "18ft", "1cm", "narrow", "8 km", "400m", "14ft", "10'", "10'11\"", "1'9.8\"", "1.18\""]: 
    6363            assert not a.node(None, {"width":d}), ("width='%s'" % d) 
    6464 
Note: See TracChangeset for help on using the changeset viewer.