[Mp-plugins-svn] SF.net SVN: mp-plugins:[2181] trunk/plugins/WorldMap

[<lk...@us...>]

Revision: 2181
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2181&view=rev
Author:   lkuech
Date:     2008-10-10 06:39:13 +0000 (Fri, 10 Oct 2008)

Log Message:
-----------
WoWorldMap: Some more url related changes

Modified Paths:
--------------
    trunk/plugins/WorldMap/MAPS/MapFunctions.cs
    trunk/plugins/WorldMap/MyWorldMap.csproj
    trunk/plugins/WorldMap/Settings.cs

Removed Paths:
-------------
    trunk/plugins/WorldMap/System.Data.SQLite.DLL

Modified: trunk/plugins/WorldMap/MAPS/MapFunctions.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/MapFunctions.cs	2008-10-09 17:31:15 UTC (rev 2180)
+++ trunk/plugins/WorldMap/MAPS/MapFunctions.cs	2008-10-10 06:39:13 UTC (rev 2181)
@@ -364,7 +364,7 @@
 
     public static string GetGMapTileCode(int TileX, int TileY, int zoomLevel)
     {
-      int localzoom = zoomLevel;//(17 - zoomLevel);
+      int localzoom = (17 - zoomLevel);
       string tileid = "";
       double numLong = (int)TileX;
       double numLat = (int)TileY;

Modified: trunk/plugins/WorldMap/MyWorldMap.csproj
===================================================================
--- trunk/plugins/WorldMap/MyWorldMap.csproj	2008-10-09 17:31:15 UTC (rev 2180)
+++ trunk/plugins/WorldMap/MyWorldMap.csproj	2008-10-10 06:39:13 UTC (rev 2181)
@@ -36,6 +36,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Dialogs\bin\Debug\Dialogs.dll</HintPath>
     </Reference>
+    <Reference Include="GUIWorldMap.SQLite, Version=1.0.60.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>.\GUIWorldMap.SQLite.DLL</HintPath>
+    </Reference>
     <Reference Include="Microsoft.DirectX.Direct3D, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
       <HintPath>..\MediaPortal.Base\Microsoft.DirectX.Direct3D.dll</HintPath>
     </Reference>
@@ -48,10 +52,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.41.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>.\System.Data.SQLite.DLL</HintPath>
-    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />

Modified: trunk/plugins/WorldMap/Settings.cs
===================================================================
--- trunk/plugins/WorldMap/Settings.cs	2008-10-09 17:31:15 UTC (rev 2180)
+++ trunk/plugins/WorldMap/Settings.cs	2008-10-10 06:39:13 UTC (rev 2181)
@@ -99,13 +99,13 @@
         if (LastZoomFactor < 1f) LastZoomFactor = 1f;
         LastMapType = IntToMapType(reader.GetValueAsInt(SectionName, ParmLastMapType, 1));
 
-        ThreadCountGMR = reader.GetValueAsInt(SectionName, ParmThreadCountGMR, 5);
-        ThreadCountGMA = reader.GetValueAsInt(SectionName, ParmThreadCountGMA, 5);
-        ThreadCountGMH = reader.GetValueAsInt(SectionName, ParmThreadCountGMH, 5);
-        ThreadCountGMT = reader.GetValueAsInt(SectionName, ParmThreadCountGMT, 5);
-        ThreadCountVER = reader.GetValueAsInt(SectionName, ParmThreadCountVER, 5);
-        ThreadCountVEA = reader.GetValueAsInt(SectionName, ParmThreadCountVEA, 5);
-        ThreadCountVEH = reader.GetValueAsInt(SectionName, ParmThreadCountVEH, 5);
+        ThreadCountGMR = reader.GetValueAsInt(SectionName, ParmThreadCountGMR, 1);
+        ThreadCountGMA = reader.GetValueAsInt(SectionName, ParmThreadCountGMA, 1);
+        ThreadCountGMH = reader.GetValueAsInt(SectionName, ParmThreadCountGMH, 1);
+        ThreadCountGMT = reader.GetValueAsInt(SectionName, ParmThreadCountGMT, 1);
+        ThreadCountVER = reader.GetValueAsInt(SectionName, ParmThreadCountVER, 1);
+        ThreadCountVEA = reader.GetValueAsInt(SectionName, ParmThreadCountVEA, 1);
+        ThreadCountVEH = reader.GetValueAsInt(SectionName, ParmThreadCountVEH, 1);
 
         DaysToKeepCachedDetailedTiles = reader.GetValueAsInt(SectionName, ParmDaysToKeepCachedDetailedTiles, 30);
         DaysToKeepCachedOverviewTiles = reader.GetValueAsInt(SectionName, ParmDaysToKeepCachedOverviewTiles, 200);
@@ -125,12 +125,12 @@
         GenerateActionLogEntries = reader.GetValueAsBool(SectionName, ParmGenerateLogEntries, false);
       }
 
-      using (MediaPortal.Profile.Settings reader = new MediaPortal.Profile.Settings(Config.GetSubFolder(Config.Dir.Plugins,"Windows") + "\\GUIWorldmap.xml"))
+      using (MediaPortal.Profile.Settings reader = new MediaPortal.Profile.Settings(Config.GetFolder(Config.Dir.Config) + "\\GUIWorldmap.xml"))
       {
-        GMAUrl = reader.GetValueAsString(SectionName, ParmGMAUrl, "http://khm{0}.google.com/kh?n=404&v=99&t={1}");
-        GMRUrl = reader.GetValueAsString(SectionName, ParmGMRUrl, "http://mt{0}.google.com/mt?v=w2.83&x={1}&y={2}&z={3}");
-        GMHUrl = reader.GetValueAsString(SectionName, ParmGMHUrl, "http://mt{0}.google.com/mt?n=404&v=w2t.99&x={1}&y={2}&zoom={3}");
-        GMTUrl = reader.GetValueAsString(SectionName, ParmGMTUrl, "http://mt{0}.google.com/mt?v=app.81&x={1}&y={2}&z={3}");
+        GMAUrl = reader.GetValueAsString(SectionName, ParmGMAUrl, "http://khm{0}.google.com/kh?v=99&t={1}");
+        GMRUrl = reader.GetValueAsString(SectionName, ParmGMRUrl, "http://mt{0}.google.com/mt?v=w2.99&x={1}&y={2}&zoom={3}");
+        GMHUrl = reader.GetValueAsString(SectionName, ParmGMHUrl, "http://mt{0}.google.com/mt?v=w2t.99&x={1}&y={2}&zoom={3}");
+        GMTUrl = reader.GetValueAsString(SectionName, ParmGMTUrl, "http://mt{0}.google.com/mt?v=w2p.99&x={1}&y={2}&zoom={3}");
         VEUrl = reader.GetValueAsString(SectionName, ParmVEUrl, "http://{0}{1}.ortho.tiles.virtualearth.net/tiles/{0}{2}{3}?g=1");
       }
     }
@@ -174,7 +174,7 @@
 
     public void SaveMapUrls()
     {
-      using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetSubFolder(Config.Dir.Plugins, "Windows") + "\\GUIWorldmap.xml"))
+      using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetFolder(Config.Dir.Config) + "\\GUIWorldmap.xml"))
       {
         xmlwriter.SetValue(SectionName, ParmGMAUrl, GMAUrl);
         xmlwriter.SetValue(SectionName, ParmGMRUrl, GMRUrl);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.