Changeset d2a72f8 in osmose-backend


Ignore:
Timestamp:
Apr 15, 2014 9:19:44 PM (6 years ago)
Author:
Jocelyn Jaubert <jocelyn.jaubert@…>
Branches:
master
Children:
3961b51
Parents:
2cf05b2 (diff), bf44dc3 (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 edited
2 moved

Legend:

Unmodified
Added
Removed
  • analysers/analyser_merge_tmc_point_FR.py

    r7667719 r7b0ddc9  
    141141            {"highway": None, "tunnel": None}, 
    142142            ["ways"], 
    143             "P", 3, 1, 
     143            "P", 3, 5, 
    144144            500) 
  • analysers/analyser_osmosis_feature_on_way.py

    ra6719c9 rbf44dc3  
    44########################################################################### 
    55##                                                                       ## 
    6 ## Copyrights Frédéric Rodrigo 2012                                      ## 
     6## Copyrights Frédéric Rodrigo 2014                                      ## 
    77##                                                                       ## 
    88## This program is free software: you can redistribute it and/or modify  ## 
     
    5050HAVING 
    5151    NOT BOOL_OR(highway.tags?'highway') 
    52 ; 
    5352""" 
    5453 
     
    8079HAVING 
    8180    NOT BOOL_OR(railway.tags?'railway') 
    82 ; 
    83  
    8481""" 
    8582 
    86 class Analyser_Osmosis_Railway_Crossing(Analyser_Osmosis): 
     83sql30 = """ 
     84    SELECT 
     85        nodes.id, 
     86        ST_AsText(nodes.geom) 
     87    FROM 
     88        nodes 
     89        LEFT JOIN way_nodes ON 
     90            nodes.id = way_nodes.node_id 
     91        LEFT JOIN ways ON 
     92            way_nodes.way_id = ways.id 
     93    WHERE 
     94        ( 
     95            ( 
     96                nodes.tags?'highway' AND 
     97                nodes.tags->'highway' IN ('crossing', 'turning_circle', 'traffic_signals', 'stop', 'give_way', 'motorway_junction', 'mini_roundabout', 'passing_place', 'ford', 'elevator', 'turning_loop', 'incline_steep', 'stile', 'incline', 'traffic_calming', 'junction') 
     98            ) OR 
     99            nodes.tags?'barrier' 
     100        ) 
     101    GROUP BY 
     102        nodes.id, 
     103        nodes.geom 
     104    HAVING 
     105        bool_and(ways.id IS NULL OR NOT ways.tags?'highway') 
     106""" 
    87107 
     108 
     109class Analyser_Osmosis_Feature_On_Way(Analyser_Osmosis): 
    88110    def __init__(self, config, logger = None): 
    89111        Analyser_Osmosis.__init__(self, config, logger) 
    90112        self.classs[1] = {"item":"7090", "level": 2, "tag": ["railway", "highway", "fix:imagery"], "desc": T_(u"Missing way on level crossing") } 
     113        self.classs[3] = {"item":"7090", "level": 2, "tag": ["highway", "fix:chair"], "desc": T_(u"Lone highway or barrier node") } 
    91114        self.callback10 = lambda res: {"class":1, "subclass":1, "data":[self.node_full, self.positionAsText, self.way_full]} 
    92115        self.callback20 = lambda res: {"class":1, "subclass":2, "data":[self.node_full, self.positionAsText, self.way_full]} 
     116        self.callback30 = lambda res: {"class":3, "data":[self.node_full, self.positionAsText]} 
    93117 
    94118    def analyser_osmosis_all(self): 
    95119        self.run(sql10, self.callback10) 
    96120        self.run(sql20, self.callback20) 
     121        self.run(sql30, self.callback30) 
  • osmose_config.py

    ra84d097 rbf44dc3  
    174174        self.analyser["osmosis_tag_typo"] = "xxx" 
    175175        self.analyser["osmosis_cycleway_track"] = "xxx" 
    176         self.analyser["osmosis_railway_crossing"] = "xxx" 
     176        self.analyser["osmosis_feature_on_way"] = "xxx" 
    177177        self.analyser["osmosis_building_shapes"] = "xxx" 
    178178        self.analyser["osmosis_deadend"] = "xxx" 
  • plugins/TagRemove_FR.py

    r513e221 rbf44dc3  
    2929    def init(self, logger): 
    3030        Plugin.init(self, logger) 
    31         self.errors[41001] = { "item": 4100, "level": 3, "tag": ["tag", "fix:chair"], "desc": T_(u"Misused tag \"designation\"") } 
     31        self.errors[41001] = { "item": 4100, "level": 3, "tag": ["tag", "fix:chair"], "desc": T_(u"Misused tag in this country") } 
    3232 
    3333    def node(self, data, tags): 
    3434        if "designation" in tags: 
    35             return [(41001, 1, {})] 
     35            return [(41001, 1,{"en": "designation=*"})] 
     36        if "highway" in tags and tags["highway"] == "emergency_access_point": 
     37            return [(41001, 2, {"en": "highway=emergency_access_point"})] 
    3638 
    3739    def way(self, data, tags, nds): 
Note: See TracChangeset for help on using the changeset viewer.