git-svn-id: http://svn.miranda-ng.org/main/trunk@3897 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 38 insertions, 430 deletions

diff --git a/plugins/Weather/docs/weather/weatherch-XML.ini b/plugins/Weather/docs/weather/weatherch-XML.ini
deleted file mode 100644
index 393d8b641b..0000000000
--- a/plugins/Weather/docs/weather/weatherch-XML.ini
+++ /dev/null
@@ -1,325 +0,0 @@
-[Weather 0.3.x Update Data 1.1]

-

-; History:

-; 2004/04/01	Initial release

-; 2004/04/14	Update to v1.1, add variables for 10-day forecasts

-; 2004/04/19	Fix search for 3.2.4, new format for 10-day forecasts

-

-[Header]

-Name=Weather Channel

-Internal Name=wch_xml

-Description=Download XML weather information from www.weather.com

-Author=sirius

-Version=2004/04/19

-

-[Default]

-Default URL=http://www.weather.com/outlook/travel/local/%s

-Default Map=http://www.weather.com/outlook/travel/map/%s

-Update URL=http://xoap.weather.com/weather/local/%s?cc=*&dayf=10&par=&key=&unit=s

-

-[tm]

-Start=<tm>

-End=</tm>

-

-[Sunrise]

-Start=<sunr>

-End=</sunr>

-

-[Sunset]

-Start=<suns>

-End=</suns>

-

-[Zone]

-Start=<zone>

-End=</zone>

-

-

-[Local Time]

-Set Data=[tm] & " UTC(" & [Zone] & ")"

-

-

-[Update]

-Start=<lsup>

-End=</lsup>

-

-[Temperature]

-Start=<tmp>

-End=</tmp>

-Unit=F

-

-[Feel]

-Start=<flik>

-End=</flik>

-Unit=F

-

-[Condition]

-Start=<t>

-End=</t>

-

-[Pressure]

-Start=<r>

-End=</r>

-Unit=in

-

-[Pressure Change]

-Start=<d>

-End=</d>

-Unit=in

-

-[Wind Speed]

-Start=<s>

-End=</s> 

-Unit=mph

-

-[Wind Direction]

-Start=<t>

-End=</t>

-

-[Humidity]

-Start=<hmid>

-End=</hmid>

-

-[Visibility]

-Start=<vis>

-End=</vis>

-Unit=miles

-

-[Dewpoint]

-Start=<dewp>

-End=</dewp>

-Unit=F

-

-[FD1D]

-Start=dt="

-End=">

-[FD1H]

-Start=<hi>

-End=</hi>

-Unit=F

-[FD1L]

-Start=<low>

-End=</low>

-Unit=F

-[FD1C]

-Start=<t>

-End=</t>

-[FD1P]

-Start=<ppcp>

-End=</ppcp>

-[FD2D]

-Start=dt="

-End=">

-[FD2H]

-Start=<hi>

-End=</hi>

-Unit=F

-[FD2L]

-Start=<low>

-End=</low>

-Unit=F

-[FD2C]

-Start=<t>

-End=</t>

-[FD2P]

-Start=<ppcp>

-End=</ppcp>

-[FD3D]

-Start=dt="

-End=">

-[FD3H]

-Start=<hi>

-End=</hi>

-Unit=F

-[FD3L]

-Start=<low>

-End=</low>

-Unit=F

-[FD3C]

-Start=<t>

-End=</t>

-[FD3P]

-Start=<ppcp>

-End=</ppcp>

-[FD4D]

-Start=dt="

-End=">

-[FD4H]

-Start=<hi>

-End=</hi>

-Unit=F

-[FD4L]

-Start=<low>

-End=</low>

-Unit=F

-[FD4C]

-Start=<t>

-End=</t>

-[FD4P]

-Start=<ppcp>

-End=</ppcp>

-[FD5D]

-Start=dt="

-End=">

-[FD5H]

-Start=<hi>

-End=</hi>

-Unit=F

-[FD5L]

-Start=<low>

-End=</low>

-Unit=F

-[FD5C]

-Start=<t>

-End=</t>

-[FD5P]

-Start=<ppcp>

-End=</ppcp>

-[FD6D]

-Start=dt="

-End=">

-[FD6H]

-Start=<hi>

-End=</hi>

-Unit=F

-[FD6L]

-Start=<low>

-End=</low>

-Unit=F

-[FD6C]

-Start=<t>

-End=</t>

-[FD6P]

-Start=<ppcp>

-End=</ppcp>

-[FD7D]

-Start=dt="

-End=">

-[FD7H]

-Start=<hi>

-End=</hi>

-Unit=F

-[FD7L]

-Start=<low>

-End=</low>

-Unit=F

-[FD7C]

-Start=<t>

-End=</t>

-[FD7P]

-Start=<ppcp>

-End=</ppcp>

-[FD8D]

-Start=dt="

-End=">

-[FD8H]

-Start=<hi>

-End=</hi>

-Unit=F

-[FD8L]

-Start=<low>

-End=</low>

-Unit=F

-[FD8C]

-Start=<t>

-End=</t>

-[FD8P]

-Start=<ppcp>

-End=</ppcp>

-[FD9D]

-Start=dt="

-End=">

-[FD9H]

-Start=<hi>

-End=</hi>

-Unit=F

-[FD9L]

-Start=<low>

-End=</low>

-Unit=F

-[FD9C]

-Start=<t>

-End=</t>

-[FD9P]

-Start=<ppcp>

-End=</ppcp>

-[FD10D]

-Start=dt="

-End=">

-[FD10H]

-Start=<hi>

-End=</hi>

-Unit=F

-[FD10L]

-Start=<low>

-End=</low>

-Unit=F

-[FD10C]

-Start=<t>

-End=</t>

-[FD10P]

-Start=<ppcp>

-End=</ppcp>

-

-

-[High]

-Set Data=[FD1H]

-

-[Low]

-Set Data=[FD1L]

-

-

-[Forecast Day 1]

-Set Data=[FD1D] & "  " & [FD1H] & "/" & [FD1L] & "  " & [FD1P] & "%, " & [FD1C] 

-

-[Forecast Day 2]

-Set Data=[FD2D] & "  " & [FD2H] & "/" & [FD2L] & "  " & [FD2P] & "%, " & [FD2C] 

-

-[Forecast Day 3]

-Set Data=[FD3D] & "  " & [FD3H] & "/" & [FD3L] & "  " & [FD3P] & "%, " & [FD3C] 

-

-[Forecast Day 4]

-Set Data=[FD4D] & "  " & [FD4H] & "/" & [FD4L] & "  " & [FD4P] & "%, " & [FD4C] 

-

-[Forecast Day 5]

-Set Data=[FD5D] & "  " & [FD5H] & "/" & [FD5L] & "  " & [FD5P] & "%, " & [FD5C] 

-

-[Forecast Day 6]

-Set Data=[FD6D] & "  " & [FD6H] & "/" & [FD6L] & "  " & [FD6P] & "%, " & [FD6C] 

-

-[Forecast Day 7]

-Set Data=[FD7D] & "  " & [FD7H] & "/" & [FD7L] & "  " & [FD7P] & "%, " & [FD7C] 

-

-[Forecast Day 8]

-Set Data=[FD8D] & "  " & [FD8H] & "/" & [FD8L] & "  " & [FD8P] & "%, " & [FD8C] 

-

-[Forecast Day 9]

-Set Data=[FD9D] & "  " & [FD9H] & "/" & [FD9L] & "  " & [FD9P] & "%, " & [FD9C] 

-

-[Forecast Day 10]

-Set Data=[FD10D] & "  " & [FD10H] & "/" & [FD10L] & "  " & [FD10P] & "%, " & [FD10C] 

-

-

-

-[ID Search]

-Available=TRUE

-Search URL=http://xoap.weather.com/weather/local/%s

-Not Found Str=Invalid location provided

-Name Start=<dnam>

-Name End=</dnam>

-

-[Name Search]

-Single Result=TRUE

-Multiple Result=TRUE

-Search URL=http://xoap.weather.com/search/search?where=%s

-Not Found Str=<search ver="2.0" />

-Single Result Str=Moved/Location: 

-Single First=ID

-Single Name Start=type="1">

-Single Name End=</loc>

-Single ID Start=<loc id="

-Single ID End="

-Mult First=ID

-Mult Name Start=type="1">

-Mult Name End=</loc>

-Mult ID Start=<loc id="

-Mult ID End="

diff --git a/plugins/Weather/docs/weather/wundergrnd_intl.ini b/plugins/Weather/docs/weather/wundergrnd_intl.ini
index 6dd3889424..1893b44303 100644
--- a/plugins/Weather/docs/weather/wundergrnd_intl.ini
+++ b/plugins/Weather/docs/weather/wundergrnd_intl.ini
@@ -34,7 +34,7 @@
 Name=Weather Underground Int'l

 Internal Name=wu_intl

 Description=Download weather information for non-US cities from www.weatherunderground.com

-Author=borkra

+Author=borkra mod by Mataes

 Version=2011/02/13

 

 [Default]

@@ -107,12 +107,6 @@ Source=WindTmp
 Break Data=mph

 Unit=mph

 

-[WindDir]

-Source=WindTmp

-Break Data=from the

-End=Wind Direction

-Hidden=True

-

 [Wind Gust]

 Start=Wind Gust:

 End=</span>

@@ -130,10 +124,7 @@ Set Data="Stable"
 Start=</span>\n\t\t(

 End=)\n\t\t</td>

 

-[Pressure Tendency]

-Set Data=[Pressure Change]

-

-[Feel]

+[Heat Index]

 Start=<td>Heat Index:

 End=&nbsp;&deg;F

 Unit=F

@@ -143,18 +134,24 @@ Start=Visibility:
 End=&nbsp;miles

 Unit=miles

 

-[UVI]

+[UV Index]

 Start=UV:

 End=<span

 

-[UV]

-Set Data=[UVI]

+[Elevation]

+Start=Elevation:

+End=</span>

+Unit=ft

 

 [Wind Direction DEG]

 Start=Wind Dir:

 End=&deg;</span

 Unit=Deg

 

+[Wind Direction]

+Start=> (

+End=)</td>

+

 [Sunrise]

 Start=Actual Time</td>

 End=</td>

@@ -179,12 +176,36 @@ End=</td>
 Start=Length of Day</td>

 End=</div>

 

+[Day Length Diff Time]

+Start=<span class="b">

+End=s

+Hidden=True

+

+[Day Length Diff Word]

+End=</span>

+Hidden=True

+

+[Day Length Diff]

+Set Data=[Day Length Diff Time] & "s " & [Day Length Diff Word]

+

 [Moon Phase]

 Start=<div class="b">

+End=,

+Hidden=True

+

+[Moon Percent]

+Start= 

+End=%

+Unit=%

+Hidden=True

+

+[Moon Visible]

+Start= 

 End=</div>

+Hidden=True

 

 [Moon]

-Set Data=[Moon Phase]

+Set Data=[Moon Phase] & ", " & [Moon Percent] & " " & [Moon Visible]

 

 [Forecast Day 1 Day]

 Start=<td class="taC" style="width: 20%;">

@@ -281,10 +302,10 @@ Start=<td class="taC" >
 End=</td>

 Unit=Cond

 

-[High]

+[Max]

 Set Data=[Forecast Day 1 High]

 

-[Low]

+[Min]

 Set Data=[Forecast Day 1 Low]

 

 [Forecast Day 1]

@@ -302,94 +323,6 @@ Set Data=[Forecast Day 4 Day] & ": " & [Forecast Day 4 Condition] & ", " & [Fore
 [Forecast Day 5]

 Set Data=[Forecast Day 5 Day] & ": " & [Forecast Day 5 Condition] & ", " & [Forecast Day 5 High] & "/" & [Forecast Day 5 Low]

 

-; erase previous data

-[Forecast Day 1 Text]

-Set Data="Not Available"

-[Forecast Day 1 Night Text]

-Set Data="Not Available"

-[Forecast Day 2 Text]

-Set Data="Not Available"

-[Forecast Day 2 Night Text]

-Set Data="Not Available"

-[Forecast Day 3 Text]

-Set Data="Not Available"

-[Forecast Day 3 Night Text]

-Set Data="Not Available"

-[Forecast Day 4 Text]

-Set Data="Not Available"

-[Forecast Day 4 Night Text]

-Set Data="Not Available"

-[Forecast Day 5 Text]

-Set Data="Not Available"

-[Forecast Day 5 Night Text]

-Set Data="Not Available"

-[Forecast Day 6 Text]

-Set Data="Not Available"

-[Forecast Day 6 Night Text]

-Set Data="Not Available"

-[Forecast Day 7 Text]

-Set Data="Not Available"

-[Forecast Day 7 Night Text]

-Set Data="Not Available"

-; end erase data

-

-; overloading, either one will work

-[Forecast Day 1 Text]

-Start=<td class="full">\n\t\t<div class="b">

-End=</td>

-

-[Forecast Day 1 Night Text]

-Start=<td class="full">\n\t\t<div class="b">

-End=</td>

-

-[Forecast Day 2 Text]

-Start=<td class="full">\n\t\t<div class="b">

-End=</td>

-

-[Forecast Day 2 Night Text]

-Start=<td class="full">\n\t\t<div class="b">

-End=</td>

-

-[Forecast Day 3 Text]

-Start=<td class="full">\n\t\t<div class="b">

-End=</td>

-

-[Forecast Day 3 Night Text]

-Start=<td class="full">\n\t\t<div class="b">

-End=</td>

-

-[Forecast Day 4 Text]

-Start=<td class="full">\n\t\t<div class="b">

-End=</td>

-

-[Forecast Day 4 Night Text]

-Start=<td class="full">\n\t\t<div class="b">

-End=</td>

-

-[Forecast Day 5 Text]

-Start=<td class="full">\n\t\t<div class="b">

-End=</td>

-

-[Forecast Day 5 Night Text]

-Start=<td class="full">\n\t\t<div class="b">

-End=</td>

-

-[Forecast Day 6 Text]

-Start=<td class="full">\n\t\t<div class="b">

-End=</td>

-

-[Forecast Day 6 Night Text]

-Start=<td class="full">\n\t\t<div class="b">

-End=</td>

-

-[Forecast Day 7 Text]

-Start=<td class="full">\n\t\t<div class="b">

-End=</td>

-

-[Forecast Day 7 Night Text]

-Start=<td class="full">\n\t\t<div class="b">

-End=</td>

-

 [ID Search]

 Available=TRUE

 Search URL=http://english.wunderground.com/global/stations/%s.html