Changeset 28549 in osm

Timestamp:

2012-08-15T14:15:41+02:00 (13 years ago)

Author:

donvip

Message:

[josm_tag2link] fix #josm7962 - Replace <source> by <src> to allow its uage on OSM wiki

Location:

applications/editors/josm/plugins/tag2link

Files:

• resources/tag2link_sources.xml (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/tag2link/io/SourcesReader.java (modified) (1 diff)

applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml

@@ -21 +21 @@
     <!-- Global --> 
 
-    <source name="Common">
+    <src name="Common">
         <rule>
             <condition k="(contact:)?website" />
@@ -34 +34 @@
             <link name="Send Email" href="mailto:%v%" />
         </rule>
-    </source>
+    </src>
     
-    <source name="Wikipedia">
+    <src name="Wikipedia">
         <rule>
             <condition k="wikipedia(?::(\p{Lower}{2,}))?" v="(?:(\p{Lower}{2,}):)?(.*)" />
             <link name="View %name% article" href="http://%k.1:v.1:en%.wikipedia.org/wiki/%v.2:v.1%" />
         </rule>
-    </source>
+    </src>
 
-    <source name="WHC">
+    <src name="WHC">
         <rule>
             <condition k="ref:whc" v="[0-9-]+" />
             <link name="View UNESCO sheet" href="http://whc.unesco.org/%lang(en,fr):en%/list/%v%" />
         </rule>
-    </source>
+    </src>
     
     <!-- Only for France --> 
     
-    <source name="SANDRE" country-code="FR">
+    <src name="SANDRE" country-code="FR">
         <rule>
             <condition k="ref:(FR:)?sandre" v="[A-Z0-9-]{8}" />
             <link name="View %name% sheet of river" href="http://services.sandre.eaufrance.fr/Courdo/Fiche/client/fiche_courdo.php?CdSandre=%v%" />
         </rule>
-    </source>
+    </src>
     
-    <source name="INSEE" country-code="FR">
+    <src name="INSEE" country-code="FR">
         <rule>
             <condition k="admin_level" v="8"/>
@@ -96 +96 @@
             <link name="View %name% list of regions" href="http://www.insee.fr/fr/methodes/nomenclatures/cog/region.asp" />
         </rule>
-    </source>
+    </src>
     
-    <source name="CEF" country-code="FR">
+    <src name="CEF" country-code="FR">
         <rule>
             <condition k="ref:(FR:)?CEF" v="[A-Z0-9_]{8}" />
             <link name="View %name% sheet of church" href="http://www.messesinfo.catholique.fr/public/fiche.php?valcode=%v%" />
         </rule>
-    </source>
+    </src>
 
-    <source name="MHS" country-code="FR">
+    <src name="MHS" country-code="FR">
         <rule>
             <condition k="ref:(FR:)?mhs" v="\p{Upper}{2}\p{Digit}{8}" />
@@ -114 +114 @@
             <link name="View Mérimée list for this municipality" href="http://www.culture.gouv.fr/public/mistral/merimee_fr?ACTION=CHERCHER&amp;FIELD_1=cmer1&amp;VALUE_1=%v%" />
         </rule>
-    </source>
+    </src>
 
-    <source name="IGN" country-code="FR">
+    <src name="IGN" country-code="FR">
                 <!-- 
                 http://geodesie.ign.fr/fiches/index.php?module=e&action=fichepdf&source=carte&sit_no=4509302&geo_cid=0&lambda=1.90024744&phi=48.03041621
@@ -137 +137 @@
             <link name="View %name% sheet of geodesic site" href="http://geodesie.ign.fr/fiches/index.php?module=e&amp;action=fichepdf&amp;source=carte&amp;sit_no=%ref.v.1%" />
         </rule>
-    </source>
+    </src>
 
-    <source name="Education Nationale" country-code="FR">
+    <src name="Education Nationale" country-code="FR">
         <rule>
             <condition k="ref:(FR:)?UAI" />
             <link name="View UAI sheet of school/college" href="http://www.education.gouv.fr/bce/avancee/fiche.php?NUMERO_UAI=%v%&amp;type_info=UAI_all" />
         </rule>
-    </source>
+    </src>
 
     <!-- social facility --> 
-    <source name="FINESS" country-code="FR">
+    <src name="FINESS" country-code="FR">
         <rule>
             <condition k="ref:(FR:)?FINESS" v="[A-Z0-9-]{9}" />
             <link name="View %name% sheet of hospital/home" href="http://finess.sante.gouv.fr/finess/jsp/actionDetailEtablissement.do?noFiness=%v%" />
         </rule>
-    </source>
+    </src>
     
 </tag2link>

applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/io/SourcesReader.java

@@ -144 +144 @@
             int event = parser.next();
             if (event == XMLStreamConstants.START_ELEMENT) {
-                if (parser.getLocalName().equals("source")) {
+                if (parser.getLocalName().equals("src")) {
                     result.add(parseSource());
                 } else {