Changeset 15794 in josm

Timestamp:

2020-01-29T20:58:58+01:00 (5 years ago)

Author:

simon04

Message:

see #13901 - Tag2Link: add http:// to website

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/Tag2Link.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/Tag2Link.java

@@ -137 +137 @@
 
         // Common
-        final boolean valueIsURL = value.matches("^(http:|https:|www\\.).*");
-        if (key.matches("^(.+[:_])?website([:_].+)?$") && valueIsURL) {
-            linkConsumer.acceptLink(getLinkName(value, key), value);
+        final String validURL = value.startsWith("http:") || value.startsWith("https:")
+                ? value
+                : value.startsWith("www.")
+                ? "http://" + value
+                : null;
+        if (key.matches("^(.+[:_])?website([:_].+)?$") && validURL != null) {
+            linkConsumer.acceptLink(getLinkName(validURL, key), validURL);
         }
-        if (key.matches("^(.+[:_])?source([:_].+)?$") && valueIsURL) {
-            linkConsumer.acceptLink(getLinkName(value, key), value);
+        if (key.matches("^(.+[:_])?source([:_].+)?$") && validURL != null) {
+            linkConsumer.acceptLink(getLinkName(validURL, key), validURL);
         }
-        if (key.matches("^(.+[:_])?url([:_].+)?$") && valueIsURL) {
-            linkConsumer.acceptLink(getLinkName(value, key), value);
+        if (key.matches("^(.+[:_])?url([:_].+)?$") && validURL != null) {
+            linkConsumer.acceptLink(getLinkName(validURL, key), validURL);
         }
-        if (key.matches("image") && valueIsURL) {
-            linkConsumer.acceptLink(tr("View image"), value);
+        if (key.matches("image") && validURL != null) {
+            linkConsumer.acceptLink(tr("View image"), validURL);
         }
 

trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java

@@ -22 +22 @@
     void checkLinks(String... expected) {
         Assert.assertEquals(Arrays.asList(expected), links);
+    }
+
+    /**
+     * Unit test of function {@link Tag2Link#getLinksForTag}.
+     */
+    @Test
+    public void testWebsite() {
+        Tag2Link.getLinksForTag("website", "http://www.openstreetmap.org/", this::addLink);
+        checkLinks("Open www.openstreetmap.org // http://www.openstreetmap.org/");
+        links.clear();
+        Tag2Link.getLinksForTag("website", "https://www.openstreetmap.org/", this::addLink);
+        checkLinks("Open www.openstreetmap.org // https://www.openstreetmap.org/");
+        links.clear();
+        Tag2Link.getLinksForTag("website", "www.openstreetmap.org", this::addLink);
+        checkLinks("Open www.openstreetmap.org // http://www.openstreetmap.org");
     }