Changeset 11994 in josm

Timestamp:

2017-04-24T11:39:15+02:00 (7 years ago)

Author:

stoecker

Message:

fix #14685 - wiki language link extractor fails for URL's with equal beginning, drop old workaround

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• scripts/presets_lang.pl (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -7461 +7461 @@
         </item> <!-- Power Transformer -->
         <item name="Power Switchgear" icon="presets/power/switchgear.svg" type="closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=switch"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=switch" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switchgear"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=switchgear" />
             <space />
             <label text="(Please only use this tag if more detailed mapping using busbars and bays is impossible!)" />

trunk/scripts/presets_lang.pl

@@ -37 +37 @@
       my $h = uri_unescape($data{href});
       my $v = "href=\"$h\"";
-      if($h eq "http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema")
-      {
-        $datan{"de"} = "/wiki/Proposed_features/De:Hausnummern";
-      }
       while($main =~ /<a href="(\/wiki\/[^"]+)"[^>]+><b>·<\/b> <bdi lang="([a-z_A-Z-]+)"(?: style="unicode-bidi:embed;unicode-bidi:-webkit-isolate;unicode-bidi:isolate")?>/g)
       {
@@ -69 +65 @@
       }
       print "$v\n";
-      print "Replace failed for $data{href}.\n" if !($file =~ s/(<link )href="\Q$data{href}\E.*?( ?\/>)/$1$v$2/s);
+      print "Replace failed for $data{href}.\n" if !($file =~ s/(<link )href="\Q$data{href}\E".*?( ?\/>)/$1$v$2/s);
 
       $skip++;