From 3887e17f57d9dcaa6b0d95f4c775ccc05ca4953a Mon Sep 17 00:00:00 2001
From: Rick Gleason <fcgleason@tgp-architects.com>
Date: Thu, 1 Mar 2018 14:41:54 -0500
Subject: [PATCH] xml-update-coords

---
 data/CoordinateSets.xml              |  6 +++--
 data/WeatherFaxInternetRetrieval.xml | 35 ++++++++++++++--------------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/data/CoordinateSets.xml b/data/CoordinateSets.xml
index f670b4976..b8e7c57bb 100644
--- a/data/CoordinateSets.xml
+++ b/data/CoordinateSets.xml
@@ -250,8 +250,10 @@
     <Coordinate Name="Mauritius Meterological - Mauritius - 1" X1="75" Y1="114" Lat1="-10.00000" Lon1="40.00000" X2="790" Y2="497" Lat2="-30.00000" Lon2="80.00000" Mapping="FixedFlat" InputPoleY="-1672" InputEquator="-65.00000" InputTrueRatio="1.0000" MappingMultiplier="1.0000" MappingRatio="0.6070" />
     <Coordinate Name="Mauritius Meterological - Mauritius - 2" X1="114" Y1="119" Lat1="-5.00000" Lon1="45.00000" X2="1149" Y2="727" Lat2="-30.00000" Lon2="90.00000" Mapping="Mercator" MappingMultiplier="1.0000" MappingRatio="0.9495" />
     <Coordinate Name="Japan Meteorological Agency - Japan - 1" X1="934" Y1="2052" Lat1="60.00000" Lon1="140.00000" X2="1352" Y2="2842" Lat2="0.00000" Lon2="180.00000" Mapping="Polar" InputPoleX="300" InputPoleY="4" InputEquator="458.00000" InputTrueRatio="1.0060" MappingMultiplier="1.0000" MappingRatio="0.8522" />
-    <Coordinate Name="Weather Online - Great Britain - 1" X1="60" Y1="29" Lat1="60.00000" Lon1="-12.00000" X2="579" Y2="623" Lat2="48.00000" Lon2="6.00000" Mapping="FixedFlat" InputPoleY="-1019" InputEquator="2093.00000" InputTrueRatio="1.0000" MappingMultiplier="1.0000" MappingRatio="0.2967" />
     <Coordinate Name="Weather Online - Asia - 1" X1="91" Y1="36" Lat1="45.00000" Lon1="60.00000" X2="573" Y2="402" Lat2="-10.00000" Lon2="140.00000" Mapping="FixedFlat" InputPoleY="-294" InputEquator="354.00000" InputTrueRatio="1.0000" MappingMultiplier="1.0000" MappingRatio="1.4227" />
+    <Coordinate Name="Weather Online - Great Britain - 1" X1="60" Y1="29" Lat1="60.00000" Lon1="-12.00000" X2="579" Y2="623" Lat2="48.00000" Lon2="6.00000" Mapping="FixedFlat" InputPoleY="-1019" InputEquator="2093.00000" InputTrueRatio="1.0000" MappingMultiplier="1.0000" MappingRatio="0.2967" />
+    <Coordinate Name="Singapore Met - Singapore - 1" X1="100" Y1="98" Lat1="20.00000" Lon1="75.00000" X2="688" Y2="418" Lat2="-20.00000" Lon2="150.00000" Mapping="Mercator" MappingMultiplier="1.0000" MappingRatio="1.0276" />
+   <Coordinate Name="Singapore Met - Singapore - 2" X1="97" Y1="109" Lat1="20.00000" Lon1="75.00000" X2="685" Y2="429" Lat2="-20.00000" Lon2="150.00000" Mapping="Mercator" MappingMultiplier="1.0000" MappingRatio="0.9963" />
     <Coordinate Name="Singapore Met - Singapore - 3" X1="96" Y1="110" Lat1="20.00000" Lon1="75.00000" X2="688" Y2="432" Lat2="-20.00000" Lon2="150.00000" Mapping="Mercator" MappingMultiplier="1.0000" MappingRatio="0.9896" />
-    <Coordinate Name="Singapore Met - Singapore - 2" X1="97" Y1="109" Lat1="20.00000" Lon1="75.00000" X2="685" Y2="429" Lat2="-20.00000" Lon2="150.00000" Mapping="Mercator" MappingMultiplier="1.0000" MappingRatio="0.9963" />
+    <Coordinate Name="Japan Met - Japan - 1" X1="915" Y1="1075" Lat1="70.00000" Lon1="140.00000" X2="1229" Y2="2116" Lat2="0.00000" Lon2="170.00000" Mapping="Polar" InputPoleX="300" InputPoleY="13" InputEquator="455.00000" InputTrueRatio="0.9670" MappingMultiplier="1.0000" MappingRatio="0.8521" />
 </WeatherFaxCoordinates>
diff --git a/data/WeatherFaxInternetRetrieval.xml b/data/WeatherFaxInternetRetrieval.xml
index faf5b971c..7395ee366 100644
--- a/data/WeatherFaxInternetRetrieval.xml
+++ b/data/WeatherFaxInternetRetrieval.xml
@@ -1951,23 +1951,7 @@
       <Area Name="2" lat1="35S" lat2="10N" lon1="150E" lon2="180W" />
     </Region>
   </Server>
-  <Server Name="Singapore Met" Url="http://www.weather.gov.sg/files/marine/">
-    <Region Name="Singapore">
-      <Map Url="surfacewinds/surfacewinds_24Hr_%Y%m%d_213000.gif" Contents="Surface Wind Forecast 24hr" Area="1" />
-      <Map Url="surfacewinds/surfacewinds_48Hr_%Y%m%d_213000.gif" Contents="Surface Wind Forecast 48hr" Area="1" />
-      <Map Url="surfacewinds/surfacewinds_72Hr_%Y%m%d_213000.gif" Contents="Surface Wind Forecast 72hr" Area="1" />
-      <Map Url="waveheight/sig_waves_height_24Hr_%Y%m%d_065000.gif" Contents="Significant Wave Forecast 24hr" Area="2" />
-      <Map Url="waveheight/sig_waves_height_48Hr_%Y%m%d_065000.gif" Contents="Significant Wave Forecast 48hr" Area="2" />
-      <Map Url="waveheight/sig_waves_height_72Hr_%Y%m%d_065000.gif" Contents="Significant Wave Forecast 72hr" Area="2" />
-      <Map Url="swell/swell_24Hr_%Y%m%d_100000.gif" Contents="Swell Wave Ht 24hr" Area="3" />
-      <Map Url="swell/swell_48Hr_%Y%m%d_100000.gif" Contents="Swell Wave Ht 48hr" Area="3" />
-      <Map Url="swell/swell_72Hr_%Y%m%d_100000.gif" Contents="Swell Wave Ht 72hr" Area="3" />
-      <Area Name="1" lat1="20S" lat2="40N" lon1="80E" lon2="150E" />
-      <Area Name="2" lat1="15S" lat2="35N" lon1="90E" lon2="130E" />
-      <Area Name="3" lat1="20S" lat2="40N" lon1="80E" lon2="150E" />
-    </Region>
-  </Server>
-  <Server Name="Bermuda" Url="http://www.weather.bm/">
+   <Server Name="Bermuda" Url="http://www.weather.bm/">
     <Region Name="Bermuda">
       <Map Url="images/surfaceAnalysis/Latest/Atlantic.gif" Contents="Surface Analysis" Area="1" />
       <Map Url="images/marineChart/Latest/Small/_chartSmall36.gif" Contents="Day 2 Marine forecast" Area="3" />
@@ -2047,4 +2031,21 @@
       <Area Name="1" lat1="10S" lat2="45N" lon1="50E" lon2="150E" />
     </Region>
   </Server>
+  <Server Name="Singapore Met" Url="http://www.weather.gov.sg/files/marine/">
+    <Region Name="Singapore">
+      <Map Url="surfacewinds/surfacewinds_24Hr_%Y%m%d_213000.gif" Contents="Surface Wind Forecast 24hr" Area="1" />
+      <Map Url="surfacewinds/surfacewinds_48Hr_%Y%m%d_213000.gif" Contents="Surface Wind Forecast 48hr" Area="1" />
+      <Map Url="surfacewinds/surfacewinds_72Hr_%Y%m%d_213000.gif" Contents="Surface Wind Forecast 72hr" Area="1" />
+      <Map Url="waveheight/sig_waves_height_24Hr_%Y%m%d_065000.gif" Contents="Significant Wave Forecast 24hr" Area="2" />
+      <Map Url="waveheight/sig_waves_height_48Hr_%Y%m%d_065000.gif" Contents="Significant Wave Forecast 48hr" Area="2" />
+      <Map Url="waveheight/sig_waves_height_72Hr_%Y%m%d_065000.gif" Contents="Significant Wave Forecast 72hr" Area="2" />
+      <Map Url="swell/swell_24Hr_%Y%m%d_100000.gif" Contents="Swell Wave Ht 24hr" Area="3" />
+      <Map Url="swell/swell_48Hr_%Y%m%d_100000.gif" Contents="Swell Wave Ht 48hr" Area="3" />
+      <Map Url="swell/swell_72Hr_%Y%m%d_100000.gif" Contents="Swell Wave Ht 72hr" Area="3" />
+      <Area Name="1" lat1="20S" lat2="40N" lon1="80E" lon2="150E" />
+      <Area Name="2" lat1="15S" lat2="35N" lon1="90E" lon2="130E" />
+      <Area Name="3" lat1="20S" lat2="40N" lon1="80E" lon2="150E" />
+    </Region>
+  </Server>
+
   </OCPNWeatherFaxInternetRetrieval>