Changeset a910761 in osmose-backend


Ignore:
Timestamp:
May 14, 2015 7:36:05 PM (2 years ago)
Author:
Jocelyn Jaubert <jocelyn.jaubert@…>
Branches:
master
Parents:
f4e515c (diff), be2fe4a (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
6 edited

Legend:

Unmodified
Added
Removed
  • analysers/analyser_osmosis_broken_highway_level_continuity.py

    r934be2f reab5d42  
    4545DECLARE BEGIN 
    4646    RETURN CASE level 
    47         WHEN 1 THEN (highway IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link')) 
    48         WHEN 2 THEN (highway IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link')) 
    49         WHEN 3 THEN (highway IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link')) 
     47        WHEN 1 THEN (highway IN ('construction', 'motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link')) 
     48        WHEN 2 THEN (highway IN ('construction', 'motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link')) 
     49        WHEN 3 THEN (highway IN ('construction', 'motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link')) 
    5050    END; 
    5151END 
  • analysers/analyser_osmosis_geodesie.py

    r9e8eba5 rff352ec  
    3535    nodes 
    3636    JOIN (VALUES 
     37        ('basilique'), 
    3738        ('bâtiment'), 
    3839        ('blockhaus'), 
     40        ('cathédrale'), 
    3941        ('château'), 
    4042        ('chapelle'), 
    4143        ('cheminée'), 
    4244        ('clocher'), 
    43         ('croix'), 
    4445        ('église'), 
    4546        ('mairie'), 
    4647        ('maison'), 
     48        ('moulin'), 
    4749        ('phare'), 
    4850        ('réservoir'), 
  • osmose_config.py

    rf4e515c rbe2fe4a  
    330330france_local_db.analyser["merge_restaurant_FR_aquitaine"] = "xxx" 
    331331france_local_db.analyser["merge_restaurant_FR_cg71"] = "xxx" 
     332france_local_db.analyser["merge_geodesie_support_FR"] = "xxx" 
    332333 
    333334######################################################################### 
  • plugins/TagFix_Deprecated.py

    rb403591 r42f9007  
    3636 
    3737    def deprecated_list(self): 
    38         data = urlread("http://wiki.openstreetmap.org/wiki/Deprecated_features?action=raw", 1) 
     38        data = urlread("http://wiki.openstreetmap.org/wiki/Template:Deprecated_features?action=raw", 1) 
    3939        #data = open("Deprecated_features?action=raw").read() 
    40         data = data[:data.index('\n|}\n')].split("|-") 
     40        data = data.split("|-") 
    4141        dataMult = [] 
    4242        for line in data[2:]: 
     
    8888        a = TagFix_Deprecated(None) 
    8989        a.init(None) 
    90         for d in [{"amenity":"bakers"}, 
     90        for d in [{"amenity":"ev_charging"}, 
    9191                  {"highway":"incline_steep"}, 
    9292                  {"power_source":"pedalier"}, 
  • plugins/TagFix_DuplicateValue.py

    r3924bd0 r9750c679  
    2929        Plugin.init(self, logger) 
    3030        self.errors[3060] = { "item": 3060, "level": 3, "tag": ["value", "fix:chair"], "desc": T_(u"Duplicated similar values") } 
    31         self.BlackList = set(('ref', 'created_by', 'CLC:id', 'opening_hours', 'phone', 'url', 'GNS:id', 'technology', 'cables')) 
     31        self.BlackList = set(('ref', 'created_by', 'CLC:id', 'opening_hours', 'collection_times', 'phone', 'url', 'GNS:id', 'technology', 'cables')) 
    3232        import re 
    3333        self.BlackListRegex = set((re.compile('seamark:.+:colour'), re.compile('.+_ref'), re.compile('ref:.+'), re.compile('destination:.+'), re.compile('AND_.+'), re.compile('AND:.+'), re.compile('[Nn][Hh][Dd]:.+'), re.compile('massgis:.+'))) 
  • plugins/TagFix_MultipleValue.py

    r900f3c8 rd784b47  
    4848    'opening_hours', 'description', 'bus_routes', 'phone', 'created_by', 'comment', 'day_off', 'day_on', 'destination', 'fixme', 'FIXME', 'access', 'is_in', 'alt_name', 'boundary', 'fee', 'id', 'marked_trail', 'sport', 'shop', 'school:FR', 'hour_off', 'hour_on', 'old_name', 'operator', 'park_ride', 'antenna', 'brewery', 'collection_times', 'cuisine', 'exit_to', 'towards', 'traffic_sign', 'url', 'brand', 'service', 
    4949    -- No multiple value 
    50     'cycleway', 'highway', 'foot', 'layer', 'landuse', 'foot', 'building', 'left:city', 'left:country', 'left:departement', 'left:village', 'right:city', 'right:country', 'right:departement', 'right:village', 'name','maxspeed', 'lanes', 'oneway', 'admin_level', 'natural', 'smoothness', 'surface', 'tracktype', 'type', 'voltage', 'waterway', 'width', 'wikipedia', 'wires', 'wood', 'trail_visibility', 'bicycle', 'est_width', 'motorcar', 'motor_vehicle', 'mtb:scale', 'ele', 'level', 'material', 'power', 'railway', 'addr:housenumber', 'addr:street', 'attraction', 'amenity', 'leisure' ) AND 
     50    'cycleway', 'highway', 'foot', 'layer', 'landuse', 'foot', 'building', 'left:city', 'left:country', 'left:departement', 'left:village', 'right:city', 'right:country', 'right:departement', 'right:village', 'name','maxspeed', 'lanes', 'oneway', 'admin_level', 'natural', 'smoothness', 'surface', 'tracktype', 'type', 'voltage', 'waterway', 'width', 'wikipedia', 'wires', 'wood', 'trail_visibility', 'bicycle', 'est_width', 'motorcar' 'mtb:scale', 'ele', 'level', 'material', 'power', 'railway', 'addr:housenumber', 'addr:street', 'attraction', 'amenity', 'leisure' ) AND 
    5151    value LIKE '%;%' 
    5252; 
     
    7272                    'left:city', 'left:country', 'left:departement', 'left:village', 
    7373                    'leisure', 'level', 
    74                     'material', 'maxspeed', 'motorcar', 'motor_vehicle', 'mtb:scale', 
     74                    'material', 'maxspeed', 'motorcar', 'mtb:scale', 
    7575                    'name', 'natural', 
    7676                    'oneway', 
Note: See TracChangeset for help on using the changeset viewer.