Changeset 5c09fed in osmose-backend


Ignore:
Timestamp:
Mar 15, 2014 12:11:22 PM (6 years ago)
Author:
Jocelyn Jaubert <jocelyn.jaubert@…>
Branches:
master
Children:
29a986c
Parents:
0852dbb (diff), c0ba2d4 (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:
12 added
5 edited

Legend:

Unmodified
Added
Removed
  • analysers/analyser_merge_recycling_FR_capp_clothes.py

    r23808e2 rc0ba2d4  
    5050        self.osmTags = { 
    5151            "amenity": "recycling", 
    52             "recycling:clothes": "yes" 
    5352        } 
    5453        self.osmTypes = ["nodes", "ways"] 
  • analysers/analyser_merge_recycling_FR_capp_glass.py

    r5a99c24 rc0ba2d4  
    5252        self.osmTags = { 
    5353            "amenity": "recycling", 
    54             "recycling:glass": "yes" 
    5554        } 
    5655        self.osmTypes = ["nodes", "ways"] 
  • analysers/analyser_merge_recycling_FR_cub.py

    r051f570 rc0ba2d4  
    4949        self.osmTags = { 
    5050            "amenity": "recycling", 
    51             "recycling:glass": "yes" 
    5251        } 
    5352        self.osmTypes = ["nodes", "ways"] 
  • analysers/analyser_merge_tourism_FR_gironde_camp_caravan.py

    r52636cb r73bbb7d  
    111111        } 
    112112        self.conflationDistance = 300 
    113         self.text = lambda tags, fields: {"en": u"Caravan site of %s" % fields["nom"], "fr": u"Site camping-cars de %s" % fields["nom"]} 
     113        self.text = lambda tags, fields: {"en": u"Camp site of %s" % fields["raison_sociale"], "fr": u"Camping de %s" % fields["raison_sociale"]} 
    114114 
  • osmose_config.py

    r0852dbb r8382e43  
    298298france_local_db.analyser["merge_tourism_FR_gironde_museum"] = "xxx" 
    299299france_local_db.analyser["merge_tourism_FR_gironde_information"] = "xxx" 
     300france_local_db.analyser["merge_bicycle_parking_FR_bordeaux"] = "xxx" 
     301france_local_db.analyser["merge_bicycle_parking_FR_capp"] = "xxx" 
     302france_local_db.analyser["merge_bicycle_rental_FR_cub"] = "xxx" 
     303france_local_db.analyser["merge_bicycle_rental_FR_capp"] = "xxx" 
     304france_local_db.analyser["merge_public_equipment_FR_bordeaux_toilets"] = "xxx" 
     305france_local_db.analyser["merge_sport_FR_gironde_equestrian"] = "xxx" 
    300306 
    301307######################################################################### 
Note: See TracChangeset for help on using the changeset viewer.