Changeset 14682f7 in osmose-backend


Ignore:
Timestamp:
Nov 26, 2012 7:50:45 PM (5 years ago)
Author:
Jocelyn Jaubert <jocelyn.jaubert@…>
Branches:
master
Children:
7e53c8a
Parents:
2d3620a (diff), ae4f07b (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:
6 edited

Legend:

Unmodified
Added
Removed
  • analysers/analyser_merge_school_fr.py

    r1a3a1b4 rae4f07b  
    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-").replace("élementaire", "élémentaire") 
     52        self.csv_filter = lambda t: t.replace("; ", ";null").replace(";.", ";null").replace("Ecole", u"École").replace("Saint ", "Saint-").replace("Sainte ", "Sainte-").replace(u"élementaire", u"élémentaire") 
    5353        self.osmTags = { 
    5454            "amenity": ["school", "kindergarten"], 
  • analysers/analyser_osmosis_roundabout.py

    rfeccd33 r0d5f1106  
    4141            (NOT ways.tags?'junction' OR ways.tags->'junction' != 'roundabout') AND 
    4242            NOT ways.tags?'area' AND 
    43             (NOT ways.tags?'name' OR ways.tags->'name' LIKE 'Rond%') AND -- pas de nom ou commence par 'Rond' 
     43            (NOT ways.tags?'name' OR ways.tags->'name' LIKE 'Rond%' OR ways.tags->'name' LIKE 'Giratoire%') AND -- pas de nom ou commence par 'Rond' ou par 'Giratoire' 
    4444            -- geometry 
    4545            ways.is_polygon AND -- C'est un polygone 
     
    5858HAVING 
    5959    COUNT(*) >= 2-- selection des rond-points connecté a au moins deux voies 
    60 ; 
    6160""" 
    6261 
  • plugins/Name_PoorlyWrittenWayType.py

    rc9b89ef r09ac152  
    4242        self.ReTests[( 6, u"Esplanade")] = re.compile(u"^([EÉ][Ss][Pp][Ll][Aa][Nn][Aa][Dd][Ee]) .*$") 
    4343        self.ReTests[( 7, u"Rue")]       = re.compile(u"^([R][Uu][Ee]) .*$") 
     44        self.ReTests[( 8, u"Giratoire")] = re.compile(u"^([G][Ii][Rr][Aa][Tt][Oo][Ii][Rr][Ee]) .*$") 
     45        self.ReTests[( 9, u"Rond-point")]= re.compile(u"^([R][Oo][Nn][Dd]-[Pp][Oo][Ii][Nn][Tt]) .*$") 
     46        self.ReTests[( 9, u"Rondpoint")] = re.compile(u"^([R][Oo][Nn][Dd][Pp][Oo][Ii][Nn][Tt]) .*$") 
     47        self.ReTests[(10, u"Carrefour")] = re.compile(u"^([C][Aa][Rr][Rr][Ee][Ff][Oo][Uu][Rr]) .*$") 
     48        self.ReTests[(11, u"Place")]     = re.compile(u"^([P][Ll][Aa][Cc][Ee]) .*$") 
    4449        self.ReTests = self.ReTests.items() 
    4550 
  • README

    r30cbd40 rc97d32a  
    1818------------ 
    1919  python > 2.6 recommended 
    20   python-psycopg2 
    21   postgresql-8.4           # for osmosis and osm2pgsql database dumps 
    22   postgresql-8.4-postgis 
     20  python-psycopg2 > 2.4 
     21  postgresql-9.1           # for osmosis and osm2pgsql database dumps 
     22  postgresql-9.1-postgis 
    2323  sun-java6-jre            # for osmosis 
    2424  python-imposm-parser     # for pbf support in analyser_sax - need a modified version to handle timestamp and user 
    2525 
    2626osm2pgsql is compiled in osm2pgsql/ for Debian amd64 lenny and squeeze. 
    27 osmosis is installed in osmosis/osmosis-0.38/. 
     27osmosis is installed in osmosis/osmosis-0.41/. 
    2828osmconvert is installed in osmconvert/. 
    2929 
  • analysers/Analyser.py

    r34174d9 r104129b  
    3838    def get_points(self, text): 
    3939        if not text: 
    40             return 
     40            return [] 
    4141        pts = [] 
    4242        for r in self.re_points.findall(text): 
  • 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.