Changeset 26956 in osm for applications/editors

Timestamp:

2011-10-24T01:20:34+02:00 (13 years ago)

Author:

donvip

Message:

tag2link 0.2b: UNESCO WHC rule working

Location:

applications/editors/josm/plugins/tag2link

Files:

• resources/tag2link_sources.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkPlugin.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleChecker.java (modified) (4 diffs)

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

@@ -49 +49 @@
     <source name="WHC">
         <rule>
-            <condition k="ref:whc" v="\p{Digit}+" />
+            <condition k="ref:whc" v="[0-9-]+" />
             <link name="View UNESCO sheet" href="http://whc.unesco.org/%lang(en,fr):en%/list/%v%" />
         </rule>

applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkPlugin.java

@@ -28 +28 @@
  * Main class of tag2link plugin.
  * @author Don-vip
- * @version 0.2a
  * History:
+ * 0.2b 24-Oct-2011 UNESCO WHC rule working
  * 0.2a 23-Oct-2011 add Mail support + initial work on UNESCO WHC
  * 0.1c 23-Oct-2011 add MHS rule (French heritage)

applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleChecker.java

@@ -20 +20 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
@@ -63 +65 @@
                                 while (m.find()) {
                                         String arg = m.group(1);
+                                        
+                                        // Search for a standard value
                                         String val = findValue(arg, eval.matchingTags);
+                                        
+                                        // No standard value found: test lang() function
+                                        if (val == null) {
+                                                Matcher lm = Pattern.compile(".*lang(?:\\((\\p{Lower}{2,})(?:,(\\p{Lower}{2,}))*\\))?.*").matcher(arg);
+                                                if (lm.matches()) {
+                                                        String josmLang = Main.pref.get("language");
+                                                        String jvmLang = (josmLang.isEmpty() ? Locale.getDefault().getLanguage() : josmLang).split("_")[0];
+                                                        if (lm.groupCount() == 0) {
+                                                                val = jvmLang;
+                                                        } else {
+                                                                for (int i = 1; i<=lm.groupCount() && val == null; i++) {
+                                                                        if (jvmLang.equals(lm.group(i))) {
+                                                                                val = jvmLang;
+                                                                        }
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                        
+                                        // Find a default value if set after ":"
                                         if (val == null && arg.contains(":")) {
                                                 String[] vars = arg.split(":");
@@ -74 +98 @@
                                                 }
                                         }
-                                        if (val == null) {
-                                                Matcher lm = Pattern.compile("lang(?:\\(\\p{Lower}{2,}(?:,\\p{Lower}{2,})*\\))?(?::(\\p{Lower}{2,}))?").matcher(arg);
-                                                if (lm.matches()) {
-                                                        if (lm.groupCount() == 0) {
-                                                                // TODO: get JOSM current language
-                                                        } else {
-                                                                // TODO: parse next groups
-                                                        }
-                                                }
-                                        }
+                                        
+                                        // Has a value been found ?
                                         if (val != null) {
                                                 try {
@@ -95 +111 @@
                                                         }
                                                         // Finally replace parameter
-                                                        copy.url = copy.url.replaceFirst(m.group(), val);
+                                                        copy.url = copy.url.replaceFirst(Pattern.quote(m.group()), val);
                                                 } catch (UnsupportedEncodingException e) {
                                                         e.printStackTrace();