Changeset d52a258 in osmose-backend


Ignore:
Timestamp:
May 29, 2013 9:34:57 PM (6 years ago)
Author:
Jocelyn Jaubert <jocelyn.jaubert@…>
Branches:
master
Children:
94aeb63
Parents:
488f08b (diff), 79067c6 (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:
4 edited

Legend:

Unmodified
Added
Removed
  • analysers/analyser_osmosis_deadend.py

    r34a5ef0 rde9b4c5  
    4747    JOIN nodes ON 
    4848        way_nodes.node_id = nodes.id 
     49WHERE 
     50    NOT nodes.tags?'highway' OR nodes.tags->'highway' != 'turning_circle' 
    4951GROUP BY 
    5052    way_nodes.node_id, 
  • analysers/analyser_osmosis_highway_vs_building.py

    r3821411 rf09c287  
    6060    JOIN ways AS building ON 
    6161        tree.geom && building.linestring AND 
    62         ST_NPoints(highway.linestring) > 2 AND 
     62        ST_NPoints(building.linestring) > 2 AND 
    6363        ST_Intersects(tree.geom, ST_MakePolygon(building.linestring)) 
    6464    LEFT JOIN relation_members ON 
  • plugins/TagFix_MultipleTag_FR.py

    r279827a r20c2f16  
    5151            err.append((30321, 5, {"fr": u"Il faut un tag amenity=nursery|kindergarten|school en plus de school:FR"})) 
    5252 
    53         if "amenity" in tags: 
    54             if tags["amenity"] == "school" and "school:FR" not in tags: 
    55                 canonicalSchool = self.father.ToolsStripAccents(tags['name']).lower() 
    56                 for s in self.school: 
    57                     if s in canonicalSchool: 
    58                         err.append((30321, 6, {"fr": u"Ajouter le tag school:FR", "fix": {"+": {"school:FR": self.school[s]}}})) 
    59                         break 
     53        if "name" in tags and "amenity" in tags and tags["amenity"] == "school" and "school:FR" not in tags: 
     54            canonicalSchool = self.father.ToolsStripAccents(tags['name']).lower() 
     55            for s in self.school: 
     56                if s in canonicalSchool: 
     57                    err.append((30321, 6, {"fr": u"Ajouter le tag school:FR", "fix": {"+": {"school:FR": self.school[s]}}})) 
     58                    break 
    6059 
    6160        if "name" in tags and tags["name"].startswith("Chemin Rural dit "): 
  • plugins/TagFix_Postcode.py

    r064d0e3 r79067c6  
    7474        for tag in ("postal_code", "addr:postcode"): 
    7575            if tag in tags and not self.CountryPostcode.match(tags[tag]): 
    76                 err.append((31901, 0, {"en": "Invalide postcode %s for country code %s" % (tags[tag], self.Country), "fr": "Code postal %s invalide pour la code pays %s" % (tags[tag], self.Country)})) 
     76                err.append((31901, 0, {"en": "Invalide postcode %s for country code %s" % (tags[tag], self.Country), "fr": "Code postal %s invalide pour le code pays %s" % (tags[tag], self.Country)})) 
    7777 
    7878        return err 
Note: See TracChangeset for help on using the changeset viewer.