Changeset 2fbf5f3 in osmose-backend


Ignore:
Timestamp:
Nov 17, 2012 8:39:40 PM (5 years ago)
Author:
Jocelyn Jaubert <jocelyn.jaubert@…>
Branches:
master
Children:
104129b
Parents:
69541c2 (diff), 34174d9 (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:
5 edited

Legend:

Unmodified
Added
Removed
  • analysers/Analyser.py

    rfeccd33 r34174d9  
    3737 
    3838    def get_points(self, text): 
     39        if not text: 
     40            return 
    3941        pts = [] 
    4042        for r in self.re_points.findall(text): 
  • analysers/analyser_merge_school_fr.py

    rfeccd33 r1a3a1b4  
    5050        self.csv_format = "WITH DELIMITER AS ';' NULL AS 'null' CSV HEADER" 
    5151        self.csv_encoding = "ISO-8859-15" 
    52         self.csv_filter = lambda t: t.replace("; ", ";null").replace(";.", ";null").replace("Ecole", u"École").replace("Saint ", "Saint-").replace("Sainte ", "Sainte-") 
     52        self.csv_filter = lambda t: t.replace("; ", ";null").replace(";.", ";null").replace("Ecole", u"École").replace("Saint ", "Saint-").replace("Sainte ", "Sainte-").replace("élementaire", "élémentaire") 
    5353        self.osmTags = { 
    5454            "amenity": ["school", "kindergarten"], 
  • analysers/analyser_osmosis_boundary_administrative.py

    rfeccd33 rf6433d6  
    150150    def __init__(self, config, logger = None): 
    151151        Analyser_Osmosis.__init__(self, config, logger) 
    152         self.classs[100] = {"item":"6070", "level": 2, "tag": ["boundary", "geom"], "desc":{"fr":"Repère géodésique hors de sa commune"} } 
     152        self.classs[100] = {"item":"6070", "level": 3, "tag": ["boundary", "geom"], "desc":{"fr":"Repère géodésique hors de sa commune"} } 
    153153        self.classs[101] = {"item":"6070", "level": 1, "tag": ["boundary", "place"], "desc":{"fr":"Nœud place hors de sa commune"} } 
    154154        self.classs[2] = {"item":"6060", "level": 1, "tag": ["boundary", "geom"], "desc":{"fr":"Intersection entre commune"} } 
  • plugins/TagFix_DuplicateValue.py

    ra98e220 r159cfc6  
    2929        Plugin.init(self, logger) 
    3030        self.errors[3060] = { "item": 3060, "level": 3, "tag": ["value"], "desc": {"en": u"Twice similar values", "fr": u"Valeur similaire en double"} } 
    31         self.BlackList = set(('ref', 'created_by', 'CLC:id', 'opening_hours', 'phone', 'url', 'AND_a_nosr_r', 'AND_nosr_r')) 
     31        self.BlackList = set(('ref', 'created_by', 'CLC:id', 'opening_hours', 'phone', 'url', 'AND_a_nosr_r', 'AND_nosr_r', 'GNS:id')) 
    3232        import re 
    3333        self.BlackListRegex = set((re.compile('seamark:.+:colour'), re.compile('.+_ref'), re.compile('ref:.+'))) 
  • osmose_config.py

    r85475cf r69541c2  
    222222######################################################################### 
    223223 
    224 for country in "belgium luxembourg madagascar switzerland quebec".split(): 
     224for country in "belgium cameroon luxembourg madagascar switzerland quebec".split(): 
    225225  config[country] = template_config() 
    226226 
     
    270270                                   } 
    271271 
     272country = "cameroon" 
     273config[country].download["url"] = "http://download.openstreetmap.fr/extracts/africa/cameroon.osm.pbf" 
     274config[country].analyser_options = { "sax": { "plugin_filter": ["CM"] }, 
     275                                   } 
     276 
    272277country = "luxembourg" 
    273278config[country].analyser_options = { "sax": { "plugin_filter": ["fr", "LU"] }, 
Note: See TracChangeset for help on using the changeset viewer.