Changeset a37eb72 in osmose-backend


Ignore:
Timestamp:
Jun 29, 2014 1:29:57 PM (5 years ago)
Author:
Jocelyn Jaubert <jocelyn.jaubert@…>
Branches:
master
Children:
9356c1c
Parents:
0887a58 (diff), 32c3b57 (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:
1 added
13 edited

Legend:

Unmodified
Added
Removed
  • analysers/Analyser_Merge.py

    rb39b19b r9fa6940  
    471471            return # Stop, no data 
    472472 
    473         typeGeom = {'n': 'geom', 'w': 'way_locate(linestring)', 'r': 'relation_locate(id)'} 
    474         typeShape = {'n': 'geom', 'w': 'ST_Envelope(linestring)', 'r': 'relation_shape(id)'} 
     473        typeGeom = {'N': 'geom', 'W': 'way_locate(linestring)', 'R': 'relation_locate(id)'} 
     474        typeShape = {'N': 'geom', 'W': 'ST_Envelope(linestring)', 'R': 'relation_shape(id)'} 
    475475        self.logger.log(u"Retrive OSM item") 
    476476        where = "(" + (") OR (".join(map(lambda x: self.where(x), self.mapping.select.tags))) + ")" 
     
    494494                        %(geom)s IS NOT NULL AND""" + (""" 
    495495                        ST_SetSRID(ST_GeomFromText('%(bbox)s'), 4326) && %(geom)s AND""" if bbox else "") + """ 
    496                         %(where)s)""") % {"type":type[0], "ref":self.mapping.osmRef, "geom":typeGeom[type[0]], "shape":typeShape[type[0]], "from":type, "bbox":bbox, "where":where}, 
     496                        %(where)s)""") % {"type":type[0].upper(), "ref":self.mapping.osmRef, "geom":typeGeom[type[0].upper()], "shape":typeShape[type[0].upper()], "from":type, "bbox":bbox, "where":where}, 
    497497                    self.mapping.select.types 
    498498                ) 
     
    530530        self.run(sql20 % {"official": tableOfficial, "joinClause": joinClause}) 
    531531        self.run(sql21) 
    532         typeMapping = {'n': self.node_full, 'w': self.way_full, 'r': self.relation_full} 
    533532        if self.missing_osm: 
    534533            # Missing OSM 
    535534            self.run(sql22, lambda res: { 
    536535                "class": self.missing_osm["class"], 
    537                 "data": [typeMapping[res[1]], None, self.positionAsText] 
     536                "data": [self.typeMapping[res[1]], None, self.positionAsText] 
    538537            } ) 
    539538            # Invalid OSM 
    540539            self.run(sql23 % {"official": tableOfficial, "joinClause": joinClause}, lambda res: { 
    541540                "class": self.missing_osm["class"], 
    542                 "data": [typeMapping[res[1]], None, self.positionAsText] 
     541                "data": [self.typeMapping[res[1]], None, self.positionAsText] 
    543542            } ) 
    544543 
     
    548547                "class": self.possible_merge["class"], 
    549548                "subclass": str(self.stablehash("%s%s"%(res[0],str(res[3])))), 
    550                 "data": [typeMapping[res[1]], None, self.positionAsText], 
     549                "data": [self.typeMapping[res[1]], None, self.positionAsText], 
    551550                "text": self.mapping.generate.text(defaultdict(lambda:None,res[3]), defaultdict(lambda:None,res[4])), 
    552551                "fix": self.mergeTags(res[5], res[3]), 
     
    565564                "class": self.update_official["class"], 
    566565                "subclass": str(self.stablehash("%s%s"%(res[0],str(res[4])))), 
    567                 "data": [typeMapping[res[1]], None, self.positionAsText], 
     566                "data": [self.typeMapping[res[1]], None, self.positionAsText], 
    568567                "text": self.mapping.generate.text(defaultdict(lambda:None,res[3]), defaultdict(lambda:None,res[4])), 
    569568                "fix": self.mergeTags(res[4], res[3]), 
  • analysers/Analyser_Osmosis.py

    ra104b33 r9fa6940  
    4141            self.relation:"relation", self.relation_full:"relation", 
    4242        } 
     43        self.typeMapping = {'N': self.node_full, 'W': self.way_full, 'R': self.relation_full} 
    4344 
    4445    def __enter__(self): 
     
    208209        self.geom["relation"].append(self.apiconn.RelationGet(res)) 
    209210 
     211    def array_full(self, res): 
     212        for type, id in map(lambda r: (r[0], r[1:]), res): 
     213            self.typeMapping[type](int(id)) 
     214 
    210215    def positionAsText(self, res): 
    211216        for loc in self.get_points(res): 
  • analysers/analyser_merge_pitch_FR.py

    r3d2b472 r96a4fd8  
    4545class SubAnalyser_Merge_Pitch_FR(SubAnalyser_Merge_Dynamic): 
    4646    def __init__(self, config, error_file, logger, classs, topic, osmTags, defaultTags): 
    47         self.missing_official = {"item":"8170", "class": classs, "level": 3, "tag": ["merge", "leisure"], "desc": T_(u"Pitch not integrated") } 
     47        self.missing_official = {"item":"8170", "class": classs, "level": 3, "tag": ["merge", "leisure"], "desc": T_(u"Pitch not integrated %s", topic) } 
    4848        SubAnalyser_Merge_Dynamic.__init__(self, config, error_file, logger, 
    4949            Source( 
  • analysers/analyser_osmosis_relation_associatedStreet.py

    ra6719c9 rdea30cd  
    189189# plusiers fois le même numéro dans la rue 
    190190sql60 = """ 
    191 SELECT 
    192     rid, 
    193     ST_AsText(ST_Centroid(ST_Collect(geom))), 
    194     n 
    195 FROM 
    196 (( 
    197     SELECT 
    198         relations.id AS rid, 
    199         ways.tags->'addr:housenumber' AS n, 
    200         ST_Centroid(ways.linestring) AS geom 
    201     FROM 
    202         relations 
    203         JOIN relation_members ON 
    204             relations.id = relation_members.relation_id AND 
    205             relation_members.member_type = 'W' AND 
    206             relation_members.member_role = 'house' 
    207         JOIN ways ON 
    208             relation_members.member_id = ways.id AND 
    209             ways.tags?'addr:housenumber' 
    210     WHERE 
    211         relations.tags?'type' AND 
    212         relations.tags->'type' = 'associatedStreet' 
     191CREATE TEMP TABLE housenumber AS 
     192( 
     193SELECT 
     194    'N'::CHAR(1) AS type, 
     195    nodes.id, 
     196    ST_Transform(geom, {0}) AS geom, 
     197    nodes.tags->'addr:housenumber' AS number, 
     198    nodes.tags->'addr:street' AS street 
     199FROM 
     200    nodes 
     201    LEFT JOIN relation_members ON 
     202        relation_members.member_id = nodes.id AND 
     203        relation_members.member_type = 'N' AND 
     204        relation_members.member_role = 'house' 
     205WHERE 
     206    relation_members IS NULL AND 
     207    nodes.tags?'addr:housenumber' AND 
     208    nodes.tags?'addr:street' 
    213209) UNION ( 
    214     SELECT 
    215         relations.id AS rid, 
    216         nodes.tags->'addr:housenumber' AS n, 
    217         nodes.geom 
    218     FROM 
    219         relations 
    220         JOIN relation_members ON 
    221             relations.id = relation_members.relation_id AND 
    222             relation_members.member_type = 'N' AND 
    223             relation_members.member_role = 'house' 
    224         JOIN nodes ON 
    225             relation_members.member_id = nodes.id AND 
    226             nodes.tags?'addr:housenumber' 
    227     WHERE 
    228         relations.tags?'type' AND 
    229         relations.tags->'type' = 'associatedStreet' 
    230 )) AS n 
     210SELECT 
     211    'W'::CHAR(1) AS type, 
     212    ways.id, 
     213    ST_Transform(ST_Centroid(linestring), {0}) AS geom, 
     214    ways.tags->'addr:housenumber' AS number, 
     215    ways.tags->'addr:street' AS street 
     216FROM 
     217    ways 
     218    LEFT JOIN relation_members ON 
     219        relation_members.member_id = ways.id AND 
     220        relation_members.member_type = 'W' AND 
     221        relation_members.member_role = 'house' 
     222WHERE 
     223    ST_NPoints(linestring) > 1 AND 
     224    relation_members IS NULL AND 
     225    ways.tags?'addr:housenumber' AND 
     226    ways.tags?'addr:street' 
     227) UNION ( 
     228SELECT 
     229    'N'::CHAR(1) AS type, 
     230    nodes.id, 
     231    ST_Transform(geom, {0}) AS geom, 
     232    nodes.tags->'addr:housenumber' AS number, 
     233    relations.tags->'name' AS street 
     234FROM 
     235    nodes 
     236    JOIN relation_members ON 
     237        relation_members.member_id = nodes.id AND 
     238        relation_members.member_type = 'N' AND 
     239        relation_members.member_role = 'house' 
     240    JOIN relations ON 
     241        relations.id = relation_members.relation_id AND 
     242        relations.tags?'type' AND 
     243        relations.tags->'type' = 'associatedStreet' AND 
     244        relations.tags?'name' 
     245WHERE 
     246    nodes.tags?'addr:housenumber' AND 
     247    nodes.tags?'addr:street' 
     248) UNION ( 
     249SELECT 
     250    'W'::CHAR(1) AS type, 
     251    ways.id, 
     252    ST_Transform(ST_Centroid(linestring), {0}) AS geom, 
     253    ways.tags->'addr:housenumber' AS number, 
     254    relations.tags->'name' AS street 
     255FROM 
     256    ways 
     257    JOIN relation_members ON 
     258        relation_members.member_id = ways.id AND 
     259        relation_members.member_type = 'W' AND 
     260        relation_members.member_role = 'house' 
     261    JOIN relations ON 
     262        relations.id = relation_members.relation_id AND 
     263        relations.tags?'type' AND 
     264        relations.tags->'type' = 'associatedStreet' AND 
     265        relations.tags?'name' 
     266WHERE 
     267    ST_NPoints(linestring) > 1 AND 
     268    ways.tags?'addr:housenumber' AND 
     269    ways.tags?'addr:street' 
     270) 
     271""" 
     272 
     273sql61 = """ 
     274CREATE INDEX idx_housenumber_street_number ON housenumber(street, number); 
     275CREATE INDEX idx_housenumber_geom ON housenumber USING gist(geom); 
     276""" 
     277 
     278sql62 = """ 
     279SELECT 
     280    CAST(substr(LEAST(hn1.type || hn1.id, hn2.type || hn2.id), 2) AS BIGINT) AS id, 
     281    substr(LEAST(hn1.type || hn1.id, hn2.type || hn2.id), 1, 1) AS type, 
     282    ST_AsText(ST_Transform(hn1.geom, 4326)), 
     283    hn1.street, 
     284    hn1.number 
     285FROM 
     286    housenumber AS hn1 
     287    JOIN housenumber AS hn2 ON 
     288        hn1.type || hn1.id < hn2.type || hn2.id AND 
     289        hn1.street = hn2.street AND 
     290        hn1.number = hn2.number AND 
     291        ST_DWithin(hn1.geom, hn2.geom, 1000) 
    231292GROUP BY 
    232     rid, 
    233     n 
    234 HAVING 
    235     COUNT(*) > 1 
    236 ; 
     293    LEAST(hn1.type || hn1.id, hn2.type || hn2.id), 
     294    hn1.street, 
     295    hn1.number, 
     296    hn1.geom 
    237297""" 
    238298 
     
    413473 
    414474    def analyser_osmosis(self): 
     475        byType = {'N':self.node_full, 'W':self.way_full} 
    415476        self.run(sql10, lambda res: {"class":1, "subclass":1, "data":[self.way_full, self.positionAsText]} ) 
    416477        self.run(sql11, lambda res: {"class":1, "subclass":2, "data":[self.node_full, self.positionAsText]} ) 
    417         self.run(sql60, lambda res: {"class":6, "subclass":1, 
    418             "data":[self.relation_full, self.positionAsText], 
    419             "text":{"fr": u"Multiples \"%s\" dans la rue" % res[2], "en": u"Multiple \"%s\" in street" % res[2]} } ) 
     478        self.run(sql60.format(self.config.options.get("proj"))) 
     479        self.run(sql61) 
     480        self.run(sql62, lambda res: {"class":6, "subclass":1, 
     481            "data":[lambda t: byType[res[1]], None, self.positionAsText], 
     482            "text":{"fr": u"Multiples numéros \"%s\" dans la voie \"%s\"" % (res[4], res[3]), "en": u"Multiple numbers \"%s\" in way \"%s\"" % (res[4], res[3])} } ) 
    420483        self.run(sql70) 
    421484        self.run(sql80, lambda res: {"class":7, "subclass":1, "data":[self.relation_full, self.positionAsText]} ) 
    422485        self.run(sql90) 
    423486        self.run(sqlA0, lambda res: {"class":8, "subclass":1, "data":[self.relation_full, self.relation_full, self.positionAsText]} ) 
    424         byType = {'N':self.node_full, 'W':self.way_full} 
    425487        self.run(sqlB0, lambda res: {"class":9, "subclass":1, "data":[lambda t: byType[res[1]], None, self.positionAsText, self.relation_full]} ) 
    426488 
  • osmosis/CreateFunctions.sql

    r1dcd5f7 r9fa6940  
    3131 
    3232CREATE OR REPLACE FUNCTION relation_locate(rid bigint) RETURNS geometry AS $$ 
    33 DECLARE BEGIN 
    34     RETURN 
    35     (SELECT 
     33    SELECT 
    3634        geom 
    3735    FROM 
     
    4543                relation_members.member_type = 'W' 
    4644        WHERE 
    47             relation_members.relation_id = rid 
     45            relation_members.relation_id = $1 
    4846        LIMIT 1 
    4947    ) UNION ( 
     
    5654                relation_members.member_type = 'N' 
    5755        WHERE 
    58             relation_members.relation_id = rid 
     56            relation_members.relation_id = $1 
    5957        LIMIT 1 
    6058    )) AS a 
    61     LIMIT 1); 
    62 END 
    63 $$ LANGUAGE plpgsql; 
     59    LIMIT 1; 
     60$$ LANGUAGE sql; 
     61 
    6462 
    6563CREATE OR REPLACE FUNCTION relation_bbox(rid bigint) RETURNS geometry AS $$ 
     
    136134END 
    137135$$ LANGUAGE plpgsql; 
     136 
     137 
     138CREATE OR REPLACE FUNCTION any_locate(type char(1), aid bigint) RETURNS geometry AS $$ 
     139    SELECT CASE $1 
     140        WHEN 'N' THEN (SELECT geom FROM nodes WHERE nodes.id = $2) 
     141        WHEN 'W' THEN (SELECT way_locate(linestring) FROM ways WHERE ways.id = $2) 
     142        WHEN 'R' THEN relation_locate($2) 
     143    END; 
     144$$ LANGUAGE sql; 
     145 
     146 
     147CREATE OR REPLACE FUNCTION array_locate(many text[]) RETURNS geometry AS $$ 
     148    SELECT CASE 
     149        WHEN $1 IS NULL THEN NULL 
     150        ELSE any_locate(substr($1[1], 1, 1), CAST(substr($1[1], 2) AS bigint)) 
     151    END; 
     152$$ LANGUAGE sql; 
  • po/es.po

    r96c6cf7 r32c3b57  
    1111"Report-Msgid-Bugs-To: \n" 
    1212"POT-Creation-Date: 2014-04-28 19:47+0200\n" 
    13 "PO-Revision-Date: 2014-06-26 20:02+0000\n" 
     13"PO-Revision-Date: 2014-06-29 11:28+0000\n" 
    1414"Last-Translator: Jocelyn Jaubert <jjaubert@openstreetmap.fr>\n" 
    1515"Language-Team: Spanish (http://www.transifex.com/projects/p/osmose/language/es/)\n" 
     
    500500msgstr "Torre eléctrica o poste de energía olvidado" 
    501501 
    502 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:398 
     502#: ../analysers/analyser_osmosis_relation_associatedStreet.py:458 
    503503msgid "" 
    504504"addr:housenumber without addr:street must be in a associatedStreet relation" 
    505505msgstr "addr:housenumber sin addr:street debe estar en una relación associatedStreet" 
    506506 
    507 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:399 
     507#: ../analysers/analyser_osmosis_relation_associatedStreet.py:459 
    508508msgid "No street role" 
    509509msgstr "Sin rol calle" 
    510510 
    511 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:400 
     511#: ../analysers/analyser_osmosis_relation_associatedStreet.py:460 
    512512msgid "street role is not an highway" 
    513513msgstr "Rol calle no es una carretera" 
    514514 
    515 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:401 
     515#: ../analysers/analyser_osmosis_relation_associatedStreet.py:461 
    516516msgid "Roleless member" 
    517517msgstr "Miembro sin rol" 
    518518 
    519 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:402 
     519#: ../analysers/analyser_osmosis_relation_associatedStreet.py:462 
    520520msgid "Member without addr:housenumber" 
    521521msgstr "Miembro sin addr:housenumber" 
    522522 
    523 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:403 
     523#: ../analysers/analyser_osmosis_relation_associatedStreet.py:463 
    524524msgid "Number twice in the street" 
    525525msgstr "Dos números en la calle" 
    526526 
    527 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:404 
     527#: ../analysers/analyser_osmosis_relation_associatedStreet.py:464 
    528528msgid "Many street names" 
    529529msgstr "Muchos nombres en la calle" 
    530530 
    531 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:405 
     531#: ../analysers/analyser_osmosis_relation_associatedStreet.py:465 
    532532msgid "Many relations on one street" 
    533533msgstr "Muchas relaciones en una calle" 
    534534 
    535 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:406 
     535#: ../analysers/analyser_osmosis_relation_associatedStreet.py:466 
    536536msgid "House too far away from street" 
    537537msgstr "Casa muy lejos de la calle" 
     
    931931msgstr "Baños de Bordeaux no integrados" 
    932932 
    933 #: ../analysers/analyser_merge_pitch_FR.py:47 
    934933msgid "Pitch not integrated" 
    935934msgstr "Paso no integrado" 
     
    950949msgid "addr:housenumber does not start by a number" 
    951950msgstr "" 
     951 
     952#: ../analysers/analyser_merge_pitch_FR.py:47 
     953#, python-format 
     954msgid "Pitch not integrated %s" 
     955msgstr "" 
     956 
     957#: ../analysers/analyser_osmosis_fantoir.py:105 
     958msgid "Multiple name for the same ref FANTOIR" 
     959msgstr "" 
  • po/fr.po

    r96c6cf7 r32c3b57  
    1313"Report-Msgid-Bugs-To: \n" 
    1414"POT-Creation-Date: 2014-04-28 19:47+0200\n" 
    15 "PO-Revision-Date: 2014-06-26 20:02+0000\n" 
    16 "Last-Translator: Jocelyn Jaubert <jjaubert@openstreetmap.fr>\n" 
     15"PO-Revision-Date: 2014-06-26 20:09+0000\n" 
     16"Last-Translator: operon\n" 
    1717"Language-Team: French (http://www.transifex.com/projects/p/osmose/language/fr/)\n" 
    1818"MIME-Version: 1.0\n" 
     
    931931#: ../analysers/analyser_merge_public_equipment_FR_bordeaux_toilets.py:28 
    932932msgid "Bordeaux toilets not integrated" 
    933 msgstr "" 
     933msgstr "Toilettes non intégrés à Bordeaux" 
    934934 
    935935#: ../analysers/analyser_merge_pitch_FR.py:47 
     
    939939#: ../analysers/analyser_merge_car_rental_FR_paris.py:28 
    940940msgid "Paris Autolib' car rental not integrated" 
    941 msgstr "" 
     941msgstr "Location auto Autolib' à Paris non intégrés" 
    942942 
    943943#: ../analysers/analyser_merge_car_rental_FR_paris.py:29 
     
    947947#: ../analysers/analyser_merge_car_rental_FR_paris.py:30 
    948948msgid "Paris Autolib' car rental integration suggestion" 
    949 msgstr "" 
     949msgstr "Suggestion d'intégration de location auto Autolib' à Paris" 
    950950 
    951951#: ../plugins/TagFix_Housenumber.py:29 
  • po/it.po

    r96c6cf7 r32c3b57  
    1010"Report-Msgid-Bugs-To: \n" 
    1111"POT-Creation-Date: 2014-04-28 19:47+0200\n" 
    12 "PO-Revision-Date: 2014-06-26 20:02+0000\n" 
     12"PO-Revision-Date: 2014-06-29 11:28+0000\n" 
    1313"Last-Translator: Jocelyn Jaubert <jjaubert@openstreetmap.fr>\n" 
    1414"Language-Team: Italian (http://www.transifex.com/projects/p/osmose/language/it/)\n" 
     
    499499msgstr "Traliccio o palo mancante" 
    500500 
    501 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:398 
     501#: ../analysers/analyser_osmosis_relation_associatedStreet.py:458 
    502502msgid "" 
    503503"addr:housenumber without addr:street must be in a associatedStreet relation" 
    504504msgstr "addr:housenumber senza addr:street dovrebbe stare in una relazione associatedStreet" 
    505505 
    506 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:399 
     506#: ../analysers/analyser_osmosis_relation_associatedStreet.py:459 
    507507msgid "No street role" 
    508508msgstr "Strada senza role" 
    509509 
    510 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:400 
     510#: ../analysers/analyser_osmosis_relation_associatedStreet.py:460 
    511511msgid "street role is not an highway" 
    512512msgstr "Il membro street non è una strada" 
    513513 
    514 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:401 
     514#: ../analysers/analyser_osmosis_relation_associatedStreet.py:461 
    515515msgid "Roleless member" 
    516516msgstr "Membro senza ruolo" 
    517517 
    518 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:402 
     518#: ../analysers/analyser_osmosis_relation_associatedStreet.py:462 
    519519msgid "Member without addr:housenumber" 
    520520msgstr "Membro senza addr:housenumber" 
    521521 
    522 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:403 
     522#: ../analysers/analyser_osmosis_relation_associatedStreet.py:463 
    523523msgid "Number twice in the street" 
    524524msgstr "Numero civico già presente nella strada" 
    525525 
    526 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:404 
     526#: ../analysers/analyser_osmosis_relation_associatedStreet.py:464 
    527527msgid "Many street names" 
    528528msgstr "Più nomi per la stessa strada" 
    529529 
    530 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:405 
     530#: ../analysers/analyser_osmosis_relation_associatedStreet.py:465 
    531531msgid "Many relations on one street" 
    532532msgstr "Più relazioni su di una sola strada" 
    533533 
    534 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:406 
     534#: ../analysers/analyser_osmosis_relation_associatedStreet.py:466 
    535535msgid "House too far away from street" 
    536536msgstr "Casa troppo distante dalla strada" 
     
    930930msgstr "Toilette di Bordeaux non integrata" 
    931931 
    932 #: ../analysers/analyser_merge_pitch_FR.py:47 
    933932msgid "Pitch not integrated" 
    934933msgstr "Campo sportivo non integrato" 
     
    949948msgid "addr:housenumber does not start by a number" 
    950949msgstr "" 
     950 
     951#: ../analysers/analyser_merge_pitch_FR.py:47 
     952#, python-format 
     953msgid "Pitch not integrated %s" 
     954msgstr "" 
     955 
     956#: ../analysers/analyser_osmosis_fantoir.py:105 
     957msgid "Multiple name for the same ref FANTOIR" 
     958msgstr "" 
  • po/ja.po

    r96c6cf7 r32c3b57  
    1111"Report-Msgid-Bugs-To: \n" 
    1212"POT-Creation-Date: 2014-04-28 19:47+0200\n" 
    13 "PO-Revision-Date: 2014-06-26 20:02+0000\n" 
     13"PO-Revision-Date: 2014-06-29 11:28+0000\n" 
    1414"Last-Translator: Jocelyn Jaubert <jjaubert@openstreetmap.fr>\n" 
    1515"Language-Team: Japanese (http://www.transifex.com/projects/p/osmose/language/ja/)\n" 
     
    500500msgstr "送電塔や電柱がない" 
    501501 
    502 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:398 
     502#: ../analysers/analyser_osmosis_relation_associatedStreet.py:458 
    503503msgid "" 
    504504"addr:housenumber without addr:street must be in a associatedStreet relation" 
    505505msgstr "" 
    506506 
    507 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:399 
     507#: ../analysers/analyser_osmosis_relation_associatedStreet.py:459 
    508508msgid "No street role" 
    509509msgstr "通りのロールがない" 
    510510 
    511 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:400 
     511#: ../analysers/analyser_osmosis_relation_associatedStreet.py:460 
    512512msgid "street role is not an highway" 
    513513msgstr "" 
    514514 
    515 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:401 
     515#: ../analysers/analyser_osmosis_relation_associatedStreet.py:461 
    516516msgid "Roleless member" 
    517517msgstr "メンバーにロールがない" 
    518518 
    519 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:402 
     519#: ../analysers/analyser_osmosis_relation_associatedStreet.py:462 
    520520msgid "Member without addr:housenumber" 
    521521msgstr "メンバーにaddr:housenumberがない" 
    522522 
    523 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:403 
     523#: ../analysers/analyser_osmosis_relation_associatedStreet.py:463 
    524524msgid "Number twice in the street" 
    525525msgstr "通りに同じ住居番号がある" 
    526526 
    527 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:404 
     527#: ../analysers/analyser_osmosis_relation_associatedStreet.py:464 
    528528msgid "Many street names" 
    529529msgstr "通り名が多すぎる" 
    530530 
    531 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:405 
     531#: ../analysers/analyser_osmosis_relation_associatedStreet.py:465 
    532532msgid "Many relations on one street" 
    533533msgstr "" 
    534534 
    535 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:406 
     535#: ../analysers/analyser_osmosis_relation_associatedStreet.py:466 
    536536msgid "House too far away from street" 
    537537msgstr "" 
     
    931931msgstr "" 
    932932 
    933 #: ../analysers/analyser_merge_pitch_FR.py:47 
    934933msgid "Pitch not integrated" 
    935934msgstr "" 
     
    950949msgid "addr:housenumber does not start by a number" 
    951950msgstr "" 
     951 
     952#: ../analysers/analyser_merge_pitch_FR.py:47 
     953#, python-format 
     954msgid "Pitch not integrated %s" 
     955msgstr "" 
     956 
     957#: ../analysers/analyser_osmosis_fantoir.py:105 
     958msgid "Multiple name for the same ref FANTOIR" 
     959msgstr "" 
  • po/nl.po

    r96c6cf7 r32c3b57  
    99"Report-Msgid-Bugs-To: \n" 
    1010"POT-Creation-Date: 2014-04-28 19:47+0200\n" 
    11 "PO-Revision-Date: 2014-06-26 20:02+0000\n" 
     11"PO-Revision-Date: 2014-06-29 11:28+0000\n" 
    1212"Last-Translator: Jocelyn Jaubert <jjaubert@openstreetmap.fr>\n" 
    1313"Language-Team: Dutch (http://www.transifex.com/projects/p/osmose/language/nl/)\n" 
     
    498498msgstr "Ontbrekende hoogspanningsmast of paal" 
    499499 
    500 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:398 
     500#: ../analysers/analyser_osmosis_relation_associatedStreet.py:458 
    501501msgid "" 
    502502"addr:housenumber without addr:street must be in a associatedStreet relation" 
    503503msgstr "addr:housenumber zonder addr:street moet in een geassocieerde Straat relatie zijn" 
    504504 
    505 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:399 
     505#: ../analysers/analyser_osmosis_relation_associatedStreet.py:459 
    506506msgid "No street role" 
    507507msgstr "Geen straat role" 
    508508 
    509 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:400 
     509#: ../analysers/analyser_osmosis_relation_associatedStreet.py:460 
    510510msgid "street role is not an highway" 
    511511msgstr "Straat role is niet een weg" 
    512512 
    513 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:401 
     513#: ../analysers/analyser_osmosis_relation_associatedStreet.py:461 
    514514msgid "Roleless member" 
    515515msgstr "Nummer zonder role" 
    516516 
    517 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:402 
     517#: ../analysers/analyser_osmosis_relation_associatedStreet.py:462 
    518518msgid "Member without addr:housenumber" 
    519519msgstr "Lid zonder addr:housenumber" 
    520520 
    521 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:403 
     521#: ../analysers/analyser_osmosis_relation_associatedStreet.py:463 
    522522msgid "Number twice in the street" 
    523523msgstr "Nummer dubbel in straat" 
    524524 
    525 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:404 
     525#: ../analysers/analyser_osmosis_relation_associatedStreet.py:464 
    526526msgid "Many street names" 
    527527msgstr "Te veel straat namen" 
    528528 
    529 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:405 
     529#: ../analysers/analyser_osmosis_relation_associatedStreet.py:465 
    530530msgid "Many relations on one street" 
    531531msgstr "Te veel relaties op één straat" 
    532532 
    533 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:406 
     533#: ../analysers/analyser_osmosis_relation_associatedStreet.py:466 
    534534msgid "House too far away from street" 
    535535msgstr "Huis te ver weg van straat" 
     
    929929msgstr "" 
    930930 
    931 #: ../analysers/analyser_merge_pitch_FR.py:47 
    932931msgid "Pitch not integrated" 
    933932msgstr "" 
     
    948947msgid "addr:housenumber does not start by a number" 
    949948msgstr "" 
     949 
     950#: ../analysers/analyser_merge_pitch_FR.py:47 
     951#, python-format 
     952msgid "Pitch not integrated %s" 
     953msgstr "" 
     954 
     955#: ../analysers/analyser_osmosis_fantoir.py:105 
     956msgid "Multiple name for the same ref FANTOIR" 
     957msgstr "" 
  • po/osmose-backend.pot

    r96c6cf7 r32c3b57  
    497497msgstr "" 
    498498 
    499 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:398 
     499#: ../analysers/analyser_osmosis_relation_associatedStreet.py:458 
    500500msgid "" 
    501501"addr:housenumber without addr:street must be in a associatedStreet relation" 
    502502msgstr "" 
    503503 
    504 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:399 
     504#: ../analysers/analyser_osmosis_relation_associatedStreet.py:459 
    505505msgid "No street role" 
    506506msgstr "" 
    507507 
    508 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:400 
     508#: ../analysers/analyser_osmosis_relation_associatedStreet.py:460 
    509509msgid "street role is not an highway" 
    510510msgstr "" 
    511511 
    512 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:401 
     512#: ../analysers/analyser_osmosis_relation_associatedStreet.py:461 
    513513msgid "Roleless member" 
    514514msgstr "" 
    515515 
    516 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:402 
     516#: ../analysers/analyser_osmosis_relation_associatedStreet.py:462 
    517517msgid "Member without addr:housenumber" 
    518518msgstr "" 
    519519 
    520 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:403 
     520#: ../analysers/analyser_osmosis_relation_associatedStreet.py:463 
    521521msgid "Number twice in the street" 
    522522msgstr "" 
    523523 
    524 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:404 
     524#: ../analysers/analyser_osmosis_relation_associatedStreet.py:464 
    525525msgid "Many street names" 
    526526msgstr "" 
    527527 
    528 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:405 
     528#: ../analysers/analyser_osmosis_relation_associatedStreet.py:465 
    529529msgid "Many relations on one street" 
    530530msgstr "" 
    531531 
    532 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:406 
     532#: ../analysers/analyser_osmosis_relation_associatedStreet.py:466 
    533533msgid "House too far away from street" 
    534534msgstr "" 
     
    928928msgstr "" 
    929929 
    930 #: ../analysers/analyser_merge_pitch_FR.py:47 
    931930msgid "Pitch not integrated" 
    932931msgstr "" 
     
    947946msgid "addr:housenumber does not start by a number" 
    948947msgstr "" 
     948 
     949#: ../analysers/analyser_merge_pitch_FR.py:47 
     950#, python-format 
     951msgid "Pitch not integrated %s" 
     952msgstr "" 
     953 
     954#: ../analysers/analyser_osmosis_fantoir.py:105 
     955msgid "Multiple name for the same ref FANTOIR" 
     956msgstr "" 
  • po/pl.po

    r96c6cf7 r32c3b57  
    1111"Report-Msgid-Bugs-To: \n" 
    1212"POT-Creation-Date: 2014-04-28 19:47+0200\n" 
    13 "PO-Revision-Date: 2014-06-26 20:02+0000\n" 
     13"PO-Revision-Date: 2014-06-29 11:28+0000\n" 
    1414"Last-Translator: Jocelyn Jaubert <jjaubert@openstreetmap.fr>\n" 
    1515"Language-Team: Polish (http://www.transifex.com/projects/p/osmose/language/pl/)\n" 
     
    500500msgstr "Brakuje słupa energetycznego" 
    501501 
    502 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:398 
     502#: ../analysers/analyser_osmosis_relation_associatedStreet.py:458 
    503503msgid "" 
    504504"addr:housenumber without addr:street must be in a associatedStreet relation" 
    505505msgstr "addr:housenumber bez addr:street musi być w relacji associatedStreet" 
    506506 
    507 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:399 
     507#: ../analysers/analyser_osmosis_relation_associatedStreet.py:459 
    508508msgid "No street role" 
    509509msgstr "Brakuje roli street" 
    510510 
    511 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:400 
     511#: ../analysers/analyser_osmosis_relation_associatedStreet.py:460 
    512512msgid "street role is not an highway" 
    513513msgstr "Rola street nie jest drogą" 
    514514 
    515 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:401 
     515#: ../analysers/analyser_osmosis_relation_associatedStreet.py:461 
    516516msgid "Roleless member" 
    517517msgstr "Członek bez roli" 
    518518 
    519 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:402 
     519#: ../analysers/analyser_osmosis_relation_associatedStreet.py:462 
    520520msgid "Member without addr:housenumber" 
    521521msgstr "Członek bez addr:housenumber" 
    522522 
    523 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:403 
     523#: ../analysers/analyser_osmosis_relation_associatedStreet.py:463 
    524524msgid "Number twice in the street" 
    525525msgstr "Powtórzony numer na ulicy" 
    526526 
    527 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:404 
     527#: ../analysers/analyser_osmosis_relation_associatedStreet.py:464 
    528528msgid "Many street names" 
    529529msgstr "Dużo nazw ulicy" 
    530530 
    531 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:405 
     531#: ../analysers/analyser_osmosis_relation_associatedStreet.py:465 
    532532msgid "Many relations on one street" 
    533533msgstr "Dużo relacji na jednej ulicy" 
    534534 
    535 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:406 
     535#: ../analysers/analyser_osmosis_relation_associatedStreet.py:466 
    536536msgid "House too far away from street" 
    537537msgstr "Dom za daleko od drogi" 
     
    931931msgstr "Toalety bordeaux nie zintegrowane" 
    932932 
    933 #: ../analysers/analyser_merge_pitch_FR.py:47 
    934933msgid "Pitch not integrated" 
    935934msgstr "Boisko nie zintegrowane" 
     
    950949msgid "addr:housenumber does not start by a number" 
    951950msgstr "" 
     951 
     952#: ../analysers/analyser_merge_pitch_FR.py:47 
     953#, python-format 
     954msgid "Pitch not integrated %s" 
     955msgstr "" 
     956 
     957#: ../analysers/analyser_osmosis_fantoir.py:105 
     958msgid "Multiple name for the same ref FANTOIR" 
     959msgstr "" 
  • po/pt.po

    r96c6cf7 r32c3b57  
    1010"Report-Msgid-Bugs-To: \n" 
    1111"POT-Creation-Date: 2014-04-28 19:47+0200\n" 
    12 "PO-Revision-Date: 2014-06-26 20:02+0000\n" 
     12"PO-Revision-Date: 2014-06-29 11:28+0000\n" 
    1313"Last-Translator: Jocelyn Jaubert <jjaubert@openstreetmap.fr>\n" 
    1414"Language-Team: Portuguese (http://www.transifex.com/projects/p/osmose/language/pt/)\n" 
     
    499499msgstr "Falta de energia torre ou poste" 
    500500 
    501 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:398 
     501#: ../analysers/analyser_osmosis_relation_associatedStreet.py:458 
    502502msgid "" 
    503503"addr:housenumber without addr:street must be in a associatedStreet relation" 
    504504msgstr "addr: housenumber sem addr: rua deve estar em uma relação associatedStreet" 
    505505 
    506 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:399 
     506#: ../analysers/analyser_osmosis_relation_associatedStreet.py:459 
    507507msgid "No street role" 
    508508msgstr "No papel rua" 
    509509 
    510 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:400 
     510#: ../analysers/analyser_osmosis_relation_associatedStreet.py:460 
    511511msgid "street role is not an highway" 
    512512msgstr "papel rua não é uma auto-estrada" 
    513513 
    514 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:401 
     514#: ../analysers/analyser_osmosis_relation_associatedStreet.py:461 
    515515msgid "Roleless member" 
    516516msgstr "Membro Roleless" 
    517517 
    518 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:402 
     518#: ../analysers/analyser_osmosis_relation_associatedStreet.py:462 
    519519msgid "Member without addr:housenumber" 
    520520msgstr "Membro sem addr: housenumber" 
    521521 
    522 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:403 
     522#: ../analysers/analyser_osmosis_relation_associatedStreet.py:463 
    523523msgid "Number twice in the street" 
    524524msgstr "Número duas vezes na rua" 
    525525 
    526 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:404 
     526#: ../analysers/analyser_osmosis_relation_associatedStreet.py:464 
    527527msgid "Many street names" 
    528528msgstr "Muitos nomes de ruas" 
    529529 
    530 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:405 
     530#: ../analysers/analyser_osmosis_relation_associatedStreet.py:465 
    531531msgid "Many relations on one street" 
    532532msgstr "Muitas relações em uma rua" 
    533533 
    534 #: ../analysers/analyser_osmosis_relation_associatedStreet.py:406 
     534#: ../analysers/analyser_osmosis_relation_associatedStreet.py:466 
    535535msgid "House too far away from street" 
    536536msgstr "Casa muito longe da rua" 
     
    930930msgstr "" 
    931931 
    932 #: ../analysers/analyser_merge_pitch_FR.py:47 
    933932msgid "Pitch not integrated" 
    934933msgstr "" 
     
    949948msgid "addr:housenumber does not start by a number" 
    950949msgstr "" 
     950 
     951#: ../analysers/analyser_merge_pitch_FR.py:47 
     952#, python-format 
     953msgid "Pitch not integrated %s" 
     954msgstr "" 
     955 
     956#: ../analysers/analyser_osmosis_fantoir.py:105 
     957msgid "Multiple name for the same ref FANTOIR" 
     958msgstr "" 
Note: See TracChangeset for help on using the changeset viewer.