[mapguide-commits] r6275 -
trunk/Tools/Maestro/Maestro.Editors/Fusion
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Dec 2 06:26:48 EST 2011
Author: jng
Date: 2011-12-02 03:26:47 -0800 (Fri, 02 Dec 2011)
New Revision: 6275
Modified:
trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.resx
Log:
#1877: Long requested, finally implemented. OSM layer support for the Fusion editor
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.Designer.cs 2011-12-02 09:56:55 UTC (rev 6274)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.Designer.cs 2011-12-02 11:26:47 UTC (rev 6275)
@@ -48,6 +48,10 @@
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.cmbSelectionColor = new Maestro.Editors.Common.ColorComboBox();
this.grpCms = new System.Windows.Forms.GroupBox();
+ this.groupBox6 = new System.Windows.Forms.GroupBox();
+ this.chkOsmMapnik = new System.Windows.Forms.CheckBox();
+ this.chkOsmOsmarender = new System.Windows.Forms.CheckBox();
+ this.chkOsmCycleMap = new System.Windows.Forms.CheckBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.chkGoogTerrain = new System.Windows.Forms.CheckBox();
this.chkGoogStreets = new System.Windows.Forms.CheckBox();
@@ -66,6 +70,7 @@
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.grpCms.SuspendLayout();
+ this.groupBox6.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
@@ -191,6 +196,7 @@
// grpCms
//
resources.ApplyResources(this.grpCms, "grpCms");
+ this.grpCms.Controls.Add(this.groupBox6);
this.grpCms.Controls.Add(this.groupBox5);
this.grpCms.Controls.Add(this.groupBox4);
this.grpCms.Controls.Add(this.groupBox3);
@@ -199,6 +205,36 @@
this.grpCms.Name = "grpCms";
this.grpCms.TabStop = false;
//
+ // groupBox6
+ //
+ this.groupBox6.Controls.Add(this.chkOsmMapnik);
+ this.groupBox6.Controls.Add(this.chkOsmOsmarender);
+ this.groupBox6.Controls.Add(this.chkOsmCycleMap);
+ resources.ApplyResources(this.groupBox6, "groupBox6");
+ this.groupBox6.Name = "groupBox6";
+ this.groupBox6.TabStop = false;
+ //
+ // chkOsmMapnik
+ //
+ resources.ApplyResources(this.chkOsmMapnik, "chkOsmMapnik");
+ this.chkOsmMapnik.Name = "chkOsmMapnik";
+ this.chkOsmMapnik.UseVisualStyleBackColor = true;
+ this.chkOsmMapnik.CheckedChanged += new System.EventHandler(this.chkOsmMapnik_CheckedChanged);
+ //
+ // chkOsmOsmarender
+ //
+ resources.ApplyResources(this.chkOsmOsmarender, "chkOsmOsmarender");
+ this.chkOsmOsmarender.Name = "chkOsmOsmarender";
+ this.chkOsmOsmarender.UseVisualStyleBackColor = true;
+ this.chkOsmOsmarender.CheckedChanged += new System.EventHandler(this.chkOsmOsmarender_CheckedChanged);
+ //
+ // chkOsmCycleMap
+ //
+ resources.ApplyResources(this.chkOsmCycleMap, "chkOsmCycleMap");
+ this.chkOsmCycleMap.Name = "chkOsmCycleMap";
+ this.chkOsmCycleMap.UseVisualStyleBackColor = true;
+ this.chkOsmCycleMap.CheckedChanged += new System.EventHandler(this.chkOsmCycleMap_CheckedChanged);
+ //
// groupBox5
//
this.groupBox5.Controls.Add(this.chkGoogTerrain);
@@ -321,6 +357,8 @@
this.groupBox2.PerformLayout();
this.grpCms.ResumeLayout(false);
this.grpCms.PerformLayout();
+ this.groupBox6.ResumeLayout(false);
+ this.groupBox6.PerformLayout();
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
this.groupBox4.ResumeLayout(false);
@@ -367,5 +405,9 @@
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.CheckBox chkGoogTerrain;
+ private System.Windows.Forms.GroupBox groupBox6;
+ private System.Windows.Forms.CheckBox chkOsmMapnik;
+ private System.Windows.Forms.CheckBox chkOsmOsmarender;
+ private System.Windows.Forms.CheckBox chkOsmCycleMap;
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs 2011-12-02 09:56:55 UTC (rev 6274)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs 2011-12-02 11:26:47 UTC (rev 6275)
@@ -38,10 +38,10 @@
[ToolboxItem(false)]
internal partial class MapCtrl : UserControl, INotifyResourceChanged
{
- const string G_NORMAL_MAP = "ROADMAP";
- const string G_SATELLITE_MAP = "SATELLITE";
- const string G_HYBRID_MAP = "HYBRID";
- const string G_PHYSICAL_MAP = "TERRAIN";
+ const string G_NORMAL_MAP = "G_NORMAL_MAP";
+ const string G_SATELLITE_MAP = "G_SATELLITE_MAP";
+ const string G_HYBRID_MAP = "G_HYBRID_MAP";
+ const string G_PHYSICAL_MAP = "G_PHYSICAL_MAP";
const string YAHOO_MAP_REG = "YAHOO_MAP_REG";
const string YAHOO_MAP_SAT = "YAHOO_MAP_SAT";
@@ -54,7 +54,12 @@
const string Type_Google = "Google";
const string Type_Yahoo = "Yahoo";
const string Type_Bing = "VirtualEarth";
+ const string Type_OSM = "OpenStreetMap";
+ const string OSM_MAP_MAPNIK = "Mapnik";
+ const string OSM_MAP_OSMARENDER = "Osmarender";
+ const string OSM_MAP_CYCLEMAP = "CycleMap";
+
private MapCtrl()
{
InitializeComponent();
@@ -219,7 +224,7 @@
chkOverride.Checked = (_initialView != null);
InitCmsMaps(group);
- Debug.Assert(_cmsMaps.Count == 10);
+ Debug.Assert(_cmsMaps.Count == 13);
if (_initialView == null)
_initialView = group.CreateInitialView(0.0, 0.0, 0.0);
@@ -339,7 +344,12 @@
_cmsMaps[BING_AERIAL] = new CmsMap(group.CreateCmsMapEntry(Type_Bing, true, "Bing Maps Satellite", BING_AERIAL)) { IsEnabled = false };
if (!_cmsMaps.ContainsKey(BING_HYBRID))
_cmsMaps[BING_HYBRID] = new CmsMap(group.CreateCmsMapEntry(Type_Bing, true, "Bing Maps Hybrid", BING_HYBRID)) { IsEnabled = false };
-
+ if (!_cmsMaps.ContainsKey(OSM_MAP_MAPNIK))
+ _cmsMaps[OSM_MAP_MAPNIK] = new CmsMap(group.CreateCmsMapEntry(Type_OSM, true, "Open Street Map", OSM_MAP_MAPNIK)) { IsEnabled = false };
+ if (!_cmsMaps.ContainsKey(OSM_MAP_OSMARENDER))
+ _cmsMaps[OSM_MAP_OSMARENDER] = new CmsMap(group.CreateCmsMapEntry(Type_OSM, true, "Open Street Map (Osmarender)", OSM_MAP_OSMARENDER)) { IsEnabled = false };
+ if (!_cmsMaps.ContainsKey(OSM_MAP_CYCLEMAP))
+ _cmsMaps[OSM_MAP_CYCLEMAP] = new CmsMap(group.CreateCmsMapEntry(Type_OSM, true, "Open Street Map (CycleMap)", OSM_MAP_CYCLEMAP)) { IsEnabled = false };
}
private void chkOverride_CheckedChanged(object sender, EventArgs e)
@@ -519,6 +529,30 @@
EvaluateCmsStates();
}
+ private void chkOsmMapnik_CheckedChanged(object sender, EventArgs e)
+ {
+ if (_noEvents)
+ return;
+
+ SetCmsAvailability(OSM_MAP_MAPNIK, chkOsmMapnik.Checked);
+ }
+
+ private void chkOsmOsmarender_CheckedChanged(object sender, EventArgs e)
+ {
+ if (_noEvents)
+ return;
+
+ SetCmsAvailability(OSM_MAP_OSMARENDER, chkOsmOsmarender.Checked);
+ }
+
+ private void chkOsmCycleMap_CheckedChanged(object sender, EventArgs e)
+ {
+ if (_noEvents)
+ return;
+
+ SetCmsAvailability(OSM_MAP_CYCLEMAP, chkOsmCycleMap.Checked);
+ }
+
private void EvaluateCmsStates()
{
txtYahooApiKey.Enabled = IsYahooMapsEnabled();
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.resx 2011-12-02 09:56:55 UTC (rev 6274)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.resx 2011-12-02 11:26:47 UTC (rev 6275)
@@ -174,6 +174,111 @@
<data name="groupBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
+ <data name=">>chkOverride.Name" xml:space="preserve">
+ <value>chkOverride</value>
+ </data>
+ <data name=">>chkOverride.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkOverride.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>chkOverride.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name=">>txtViewScale.Name" xml:space="preserve">
+ <value>txtViewScale</value>
+ </data>
+ <data name=">>txtViewScale.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtViewScale.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtViewScale.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name=">>txtViewY.Name" xml:space="preserve">
+ <value>txtViewY</value>
+ </data>
+ <data name=">>txtViewY.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtViewY.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtViewY.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name=">>txtViewX.Name" xml:space="preserve">
+ <value>txtViewX</value>
+ </data>
+ <data name=">>txtViewX.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtViewX.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtViewX.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name=">>label4.Name" xml:space="preserve">
+ <value>label4</value>
+ </data>
+ <data name=">>label4.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label4.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label4.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name=">>label3.Name" xml:space="preserve">
+ <value>label3</value>
+ </data>
+ <data name=">>label3.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label3.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label3.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name=">>label2.Name" xml:space="preserve">
+ <value>label2</value>
+ </data>
+ <data name=">>label2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label2.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label2.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>17, 75</value>
+ </data>
+ <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>449, 56</value>
+ </data>
+ <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name=">>groupBox1.Name" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>groupBox1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>groupBox1.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>groupBox1.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
<data name="chkOverride.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -345,27 +450,6 @@
<data name=">>label2.ZOrder" xml:space="preserve">
<value>6</value>
</data>
- <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
- <value>17, 75</value>
- </data>
- <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
- <value>449, 56</value>
- </data>
- <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
- <value>2</value>
- </data>
- <data name=">>groupBox1.Name" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>groupBox1.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>groupBox1.Parent" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>groupBox1.ZOrder" xml:space="preserve">
- <value>4</value>
- </data>
<data name="label5.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -525,20 +609,11 @@
<data name=">>chkSelectionAsOverlay.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <data name="cmbSelectionColor.Location" type="System.Drawing.Point, System.Drawing">
- <value>107, 137</value>
- </data>
- <data name="cmbSelectionColor.Size" type="System.Drawing.Size, System.Drawing">
- <value>121, 21</value>
- </data>
- <data name="cmbSelectionColor.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
- </data>
<data name=">>cmbSelectionColor.Name" xml:space="preserve">
<value>cmbSelectionColor</value>
</data>
<data name=">>cmbSelectionColor.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=4.0.0.6216, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>cmbSelectionColor.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -570,27 +645,141 @@
<data name=">>groupBox2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
+ <data name="cmbSelectionColor.Location" type="System.Drawing.Point, System.Drawing">
+ <value>107, 137</value>
+ </data>
+ <data name="cmbSelectionColor.Size" type="System.Drawing.Size, System.Drawing">
+ <value>121, 21</value>
+ </data>
+ <data name="cmbSelectionColor.TabIndex" type="System.Int32, mscorlib">
+ <value>10</value>
+ </data>
+ <data name=">>cmbSelectionColor.Name" xml:space="preserve">
+ <value>cmbSelectionColor</value>
+ </data>
+ <data name=">>cmbSelectionColor.Type" xml:space="preserve">
+ <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=4.0.0.6216, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>cmbSelectionColor.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>cmbSelectionColor.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
<data name="grpCms.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
- <data name="chkGoogTerrain.AutoSize" type="System.Boolean, mscorlib">
+ <data name="chkOsmMapnik.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name="chkGoogTerrain.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <data name="chkOsmMapnik.Location" type="System.Drawing.Point, System.Drawing">
+ <value>11, 19</value>
+ </data>
+ <data name="chkOsmMapnik.Size" type="System.Drawing.Size, System.Drawing">
+ <value>61, 17</value>
+ </data>
+ <data name="chkOsmMapnik.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="chkOsmMapnik.Text" xml:space="preserve">
+ <value>Mapnik</value>
+ </data>
+ <data name=">>chkOsmMapnik.Name" xml:space="preserve">
+ <value>chkOsmMapnik</value>
+ </data>
+ <data name=">>chkOsmMapnik.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkOsmMapnik.Parent" xml:space="preserve">
+ <value>groupBox6</value>
+ </data>
+ <data name=">>chkOsmMapnik.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="chkOsmOsmarender.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkOsmOsmarender.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
- <data name="chkGoogTerrain.Location" type="System.Drawing.Point, System.Drawing">
- <value>11, 89</value>
+ <data name="chkOsmOsmarender.Location" type="System.Drawing.Point, System.Drawing">
+ <value>11, 43</value>
</data>
- <data name="chkGoogTerrain.Size" type="System.Drawing.Size, System.Drawing">
- <value>59, 17</value>
+ <data name="chkOsmOsmarender.Size" type="System.Drawing.Size, System.Drawing">
+ <value>83, 17</value>
</data>
- <data name="chkGoogTerrain.TabIndex" type="System.Int32, mscorlib">
- <value>9</value>
+ <data name="chkOsmOsmarender.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
</data>
- <data name="chkGoogTerrain.Text" xml:space="preserve">
- <value>Terrain</value>
+ <data name="chkOsmOsmarender.Text" xml:space="preserve">
+ <value>Osmarender</value>
</data>
+ <data name=">>chkOsmOsmarender.Name" xml:space="preserve">
+ <value>chkOsmOsmarender</value>
+ </data>
+ <data name=">>chkOsmOsmarender.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkOsmOsmarender.Parent" xml:space="preserve">
+ <value>groupBox6</value>
+ </data>
+ <data name=">>chkOsmOsmarender.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="chkOsmCycleMap.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkOsmCycleMap.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="chkOsmCycleMap.Location" type="System.Drawing.Point, System.Drawing">
+ <value>11, 66</value>
+ </data>
+ <data name="chkOsmCycleMap.Size" type="System.Drawing.Size, System.Drawing">
+ <value>73, 17</value>
+ </data>
+ <data name="chkOsmCycleMap.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
+ </data>
+ <data name="chkOsmCycleMap.Text" xml:space="preserve">
+ <value>CycleMap</value>
+ </data>
+ <data name=">>chkOsmCycleMap.Name" xml:space="preserve">
+ <value>chkOsmCycleMap</value>
+ </data>
+ <data name=">>chkOsmCycleMap.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkOsmCycleMap.Parent" xml:space="preserve">
+ <value>groupBox6</value>
+ </data>
+ <data name=">>chkOsmCycleMap.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="groupBox6.Location" type="System.Drawing.Point, System.Drawing">
+ <value>361, 30</value>
+ </data>
+ <data name="groupBox6.Size" type="System.Drawing.Size, System.Drawing">
+ <value>103, 114</value>
+ </data>
+ <data name="groupBox6.TabIndex" type="System.Int32, mscorlib">
+ <value>14</value>
+ </data>
+ <data name="groupBox6.Text" xml:space="preserve">
+ <value>OpenStreetMap</value>
+ </data>
+ <data name=">>groupBox6.Name" xml:space="preserve">
+ <value>groupBox6</value>
+ </data>
+ <data name=">>groupBox6.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>groupBox6.Parent" xml:space="preserve">
+ <value>grpCms</value>
+ </data>
+ <data name=">>groupBox6.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<data name=">>chkGoogTerrain.Name" xml:space="preserve">
<value>chkGoogTerrain</value>
</data>
@@ -603,21 +792,6 @@
<data name=">>chkGoogTerrain.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name="chkGoogStreets.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chkGoogStreets.Location" type="System.Drawing.Point, System.Drawing">
- <value>11, 19</value>
- </data>
- <data name="chkGoogStreets.Size" type="System.Drawing.Size, System.Drawing">
- <value>59, 17</value>
- </data>
- <data name="chkGoogStreets.TabIndex" type="System.Int32, mscorlib">
- <value>6</value>
- </data>
- <data name="chkGoogStreets.Text" xml:space="preserve">
- <value>Streets</value>
- </data>
<data name=">>chkGoogStreets.Name" xml:space="preserve">
<value>chkGoogStreets</value>
</data>
@@ -630,21 +804,6 @@
<data name=">>chkGoogStreets.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <data name="chkGoogSatellite.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chkGoogSatellite.Location" type="System.Drawing.Point, System.Drawing">
- <value>11, 43</value>
- </data>
- <data name="chkGoogSatellite.Size" type="System.Drawing.Size, System.Drawing">
- <value>63, 17</value>
- </data>
- <data name="chkGoogSatellite.TabIndex" type="System.Int32, mscorlib">
- <value>7</value>
- </data>
- <data name="chkGoogSatellite.Text" xml:space="preserve">
- <value>Satellite</value>
- </data>
<data name=">>chkGoogSatellite.Name" xml:space="preserve">
<value>chkGoogSatellite</value>
</data>
@@ -657,21 +816,6 @@
<data name=">>chkGoogSatellite.ZOrder" xml:space="preserve">
<value>2</value>
</data>
- <data name="chkGoogHybrid.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chkGoogHybrid.Location" type="System.Drawing.Point, System.Drawing">
- <value>11, 66</value>
- </data>
- <data name="chkGoogHybrid.Size" type="System.Drawing.Size, System.Drawing">
- <value>56, 17</value>
- </data>
- <data name="chkGoogHybrid.TabIndex" type="System.Int32, mscorlib">
- <value>8</value>
- </data>
- <data name="chkGoogHybrid.Text" xml:space="preserve">
- <value>Hybrid</value>
- </data>
<data name=">>chkGoogHybrid.Name" xml:space="preserve">
<value>chkGoogHybrid</value>
</data>
@@ -706,23 +850,8 @@
<value>grpCms</value>
</data>
<data name=">>groupBox5.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>1</value>
</data>
- <data name="chkBingStreets.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chkBingStreets.Location" type="System.Drawing.Point, System.Drawing">
- <value>13, 19</value>
- </data>
- <data name="chkBingStreets.Size" type="System.Drawing.Size, System.Drawing">
- <value>59, 17</value>
- </data>
- <data name="chkBingStreets.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
- </data>
- <data name="chkBingStreets.Text" xml:space="preserve">
- <value>Streets</value>
- </data>
<data name=">>chkBingStreets.Name" xml:space="preserve">
<value>chkBingStreets</value>
</data>
@@ -735,21 +864,6 @@
<data name=">>chkBingStreets.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name="chkBingSatellite.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chkBingSatellite.Location" type="System.Drawing.Point, System.Drawing">
- <value>13, 43</value>
- </data>
- <data name="chkBingSatellite.Size" type="System.Drawing.Size, System.Drawing">
- <value>63, 17</value>
- </data>
- <data name="chkBingSatellite.TabIndex" type="System.Int32, mscorlib">
- <value>1</value>
- </data>
- <data name="chkBingSatellite.Text" xml:space="preserve">
- <value>Satellite</value>
- </data>
<data name=">>chkBingSatellite.Name" xml:space="preserve">
<value>chkBingSatellite</value>
</data>
@@ -762,21 +876,6 @@
<data name=">>chkBingSatellite.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <data name="chkBingHybrid.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chkBingHybrid.Location" type="System.Drawing.Point, System.Drawing">
- <value>13, 66</value>
- </data>
- <data name="chkBingHybrid.Size" type="System.Drawing.Size, System.Drawing">
- <value>56, 17</value>
- </data>
- <data name="chkBingHybrid.TabIndex" type="System.Int32, mscorlib">
- <value>2</value>
- </data>
- <data name="chkBingHybrid.Text" xml:space="preserve">
- <value>Hybrid</value>
- </data>
<data name=">>chkBingHybrid.Name" xml:space="preserve">
<value>chkBingHybrid</value>
</data>
@@ -811,23 +910,8 @@
<value>grpCms</value>
</data>
<data name=">>groupBox4.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</value>
</data>
- <data name="chkYahooStreets.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chkYahooStreets.Location" type="System.Drawing.Point, System.Drawing">
- <value>11, 19</value>
- </data>
- <data name="chkYahooStreets.Size" type="System.Drawing.Size, System.Drawing">
- <value>59, 17</value>
- </data>
- <data name="chkYahooStreets.TabIndex" type="System.Int32, mscorlib">
- <value>3</value>
- </data>
- <data name="chkYahooStreets.Text" xml:space="preserve">
- <value>Streets</value>
- </data>
<data name=">>chkYahooStreets.Name" xml:space="preserve">
<value>chkYahooStreets</value>
</data>
@@ -840,21 +924,6 @@
<data name=">>chkYahooStreets.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name="chkYahooSatellite.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chkYahooSatellite.Location" type="System.Drawing.Point, System.Drawing">
- <value>11, 43</value>
- </data>
- <data name="chkYahooSatellite.Size" type="System.Drawing.Size, System.Drawing">
- <value>63, 17</value>
- </data>
- <data name="chkYahooSatellite.TabIndex" type="System.Int32, mscorlib">
- <value>4</value>
- </data>
- <data name="chkYahooSatellite.Text" xml:space="preserve">
- <value>Satellite</value>
- </data>
<data name=">>chkYahooSatellite.Name" xml:space="preserve">
<value>chkYahooSatellite</value>
</data>
@@ -867,21 +936,6 @@
<data name=">>chkYahooSatellite.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <data name="chkYahooHybrid.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chkYahooHybrid.Location" type="System.Drawing.Point, System.Drawing">
- <value>11, 66</value>
- </data>
- <data name="chkYahooHybrid.Size" type="System.Drawing.Size, System.Drawing">
- <value>56, 17</value>
- </data>
- <data name="chkYahooHybrid.TabIndex" type="System.Int32, mscorlib">
- <value>5</value>
- </data>
- <data name="chkYahooHybrid.Text" xml:space="preserve">
- <value>Hybrid</value>
- </data>
<data name=">>chkYahooHybrid.Name" xml:space="preserve">
<value>chkYahooHybrid</value>
</data>
@@ -916,7 +970,7 @@
<value>grpCms</value>
</data>
<data name=">>groupBox3.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>3</value>
</data>
<data name="txtYahooApiKey.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -946,7 +1000,7 @@
<value>grpCms</value>
</data>
<data name=">>txtYahooApiKey.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>4</value>
</data>
<data name="label7.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -973,7 +1027,7 @@
<value>grpCms</value>
</data>
<data name=">>label7.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>5</value>
</data>
<data name="grpCms.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 185</value>
@@ -999,6 +1053,279 @@
<data name=">>grpCms.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <data name="chkGoogTerrain.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkGoogTerrain.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="chkGoogTerrain.Location" type="System.Drawing.Point, System.Drawing">
+ <value>11, 89</value>
+ </data>
+ <data name="chkGoogTerrain.Size" type="System.Drawing.Size, System.Drawing">
+ <value>59, 17</value>
+ </data>
+ <data name="chkGoogTerrain.TabIndex" type="System.Int32, mscorlib">
+ <value>9</value>
+ </data>
+ <data name="chkGoogTerrain.Text" xml:space="preserve">
+ <value>Terrain</value>
+ </data>
+ <data name=">>chkGoogTerrain.Name" xml:space="preserve">
+ <value>chkGoogTerrain</value>
+ </data>
+ <data name=">>chkGoogTerrain.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkGoogTerrain.Parent" xml:space="preserve">
+ <value>groupBox5</value>
+ </data>
+ <data name=">>chkGoogTerrain.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="chkGoogStreets.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkGoogStreets.Location" type="System.Drawing.Point, System.Drawing">
+ <value>11, 19</value>
+ </data>
+ <data name="chkGoogStreets.Size" type="System.Drawing.Size, System.Drawing">
+ <value>59, 17</value>
+ </data>
+ <data name="chkGoogStreets.TabIndex" type="System.Int32, mscorlib">
+ <value>6</value>
+ </data>
+ <data name="chkGoogStreets.Text" xml:space="preserve">
+ <value>Streets</value>
+ </data>
+ <data name=">>chkGoogStreets.Name" xml:space="preserve">
+ <value>chkGoogStreets</value>
+ </data>
+ <data name=">>chkGoogStreets.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkGoogStreets.Parent" xml:space="preserve">
+ <value>groupBox5</value>
+ </data>
+ <data name=">>chkGoogStreets.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="chkGoogSatellite.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkGoogSatellite.Location" type="System.Drawing.Point, System.Drawing">
+ <value>11, 43</value>
+ </data>
+ <data name="chkGoogSatellite.Size" type="System.Drawing.Size, System.Drawing">
+ <value>63, 17</value>
+ </data>
+ <data name="chkGoogSatellite.TabIndex" type="System.Int32, mscorlib">
+ <value>7</value>
+ </data>
+ <data name="chkGoogSatellite.Text" xml:space="preserve">
+ <value>Satellite</value>
+ </data>
+ <data name=">>chkGoogSatellite.Name" xml:space="preserve">
+ <value>chkGoogSatellite</value>
+ </data>
+ <data name=">>chkGoogSatellite.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkGoogSatellite.Parent" xml:space="preserve">
+ <value>groupBox5</value>
+ </data>
+ <data name=">>chkGoogSatellite.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="chkGoogHybrid.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkGoogHybrid.Location" type="System.Drawing.Point, System.Drawing">
+ <value>11, 66</value>
+ </data>
+ <data name="chkGoogHybrid.Size" type="System.Drawing.Size, System.Drawing">
+ <value>56, 17</value>
+ </data>
+ <data name="chkGoogHybrid.TabIndex" type="System.Int32, mscorlib">
+ <value>8</value>
+ </data>
+ <data name="chkGoogHybrid.Text" xml:space="preserve">
+ <value>Hybrid</value>
+ </data>
+ <data name=">>chkGoogHybrid.Name" xml:space="preserve">
+ <value>chkGoogHybrid</value>
+ </data>
+ <data name=">>chkGoogHybrid.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkGoogHybrid.Parent" xml:space="preserve">
+ <value>groupBox5</value>
+ </data>
+ <data name=">>chkGoogHybrid.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name="chkBingStreets.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkBingStreets.Location" type="System.Drawing.Point, System.Drawing">
+ <value>13, 19</value>
+ </data>
+ <data name="chkBingStreets.Size" type="System.Drawing.Size, System.Drawing">
+ <value>59, 17</value>
+ </data>
+ <data name="chkBingStreets.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="chkBingStreets.Text" xml:space="preserve">
+ <value>Streets</value>
+ </data>
+ <data name=">>chkBingStreets.Name" xml:space="preserve">
+ <value>chkBingStreets</value>
+ </data>
+ <data name=">>chkBingStreets.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkBingStreets.Parent" xml:space="preserve">
+ <value>groupBox4</value>
+ </data>
+ <data name=">>chkBingStreets.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="chkBingSatellite.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkBingSatellite.Location" type="System.Drawing.Point, System.Drawing">
+ <value>13, 43</value>
+ </data>
+ <data name="chkBingSatellite.Size" type="System.Drawing.Size, System.Drawing">
+ <value>63, 17</value>
+ </data>
+ <data name="chkBingSatellite.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="chkBingSatellite.Text" xml:space="preserve">
+ <value>Satellite</value>
+ </data>
+ <data name=">>chkBingSatellite.Name" xml:space="preserve">
+ <value>chkBingSatellite</value>
+ </data>
+ <data name=">>chkBingSatellite.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkBingSatellite.Parent" xml:space="preserve">
+ <value>groupBox4</value>
+ </data>
+ <data name=">>chkBingSatellite.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="chkBingHybrid.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkBingHybrid.Location" type="System.Drawing.Point, System.Drawing">
+ <value>13, 66</value>
+ </data>
+ <data name="chkBingHybrid.Size" type="System.Drawing.Size, System.Drawing">
+ <value>56, 17</value>
+ </data>
+ <data name="chkBingHybrid.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name="chkBingHybrid.Text" xml:space="preserve">
+ <value>Hybrid</value>
+ </data>
+ <data name=">>chkBingHybrid.Name" xml:space="preserve">
+ <value>chkBingHybrid</value>
+ </data>
+ <data name=">>chkBingHybrid.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkBingHybrid.Parent" xml:space="preserve">
+ <value>groupBox4</value>
+ </data>
+ <data name=">>chkBingHybrid.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="chkYahooStreets.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkYahooStreets.Location" type="System.Drawing.Point, System.Drawing">
+ <value>11, 19</value>
+ </data>
+ <data name="chkYahooStreets.Size" type="System.Drawing.Size, System.Drawing">
+ <value>59, 17</value>
+ </data>
+ <data name="chkYahooStreets.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name="chkYahooStreets.Text" xml:space="preserve">
+ <value>Streets</value>
+ </data>
+ <data name=">>chkYahooStreets.Name" xml:space="preserve">
+ <value>chkYahooStreets</value>
+ </data>
+ <data name=">>chkYahooStreets.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkYahooStreets.Parent" xml:space="preserve">
+ <value>groupBox3</value>
+ </data>
+ <data name=">>chkYahooStreets.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="chkYahooSatellite.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkYahooSatellite.Location" type="System.Drawing.Point, System.Drawing">
+ <value>11, 43</value>
+ </data>
+ <data name="chkYahooSatellite.Size" type="System.Drawing.Size, System.Drawing">
+ <value>63, 17</value>
+ </data>
+ <data name="chkYahooSatellite.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
+ </data>
+ <data name="chkYahooSatellite.Text" xml:space="preserve">
+ <value>Satellite</value>
+ </data>
+ <data name=">>chkYahooSatellite.Name" xml:space="preserve">
+ <value>chkYahooSatellite</value>
+ </data>
+ <data name=">>chkYahooSatellite.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkYahooSatellite.Parent" xml:space="preserve">
+ <value>groupBox3</value>
+ </data>
+ <data name=">>chkYahooSatellite.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="chkYahooHybrid.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkYahooHybrid.Location" type="System.Drawing.Point, System.Drawing">
+ <value>11, 66</value>
+ </data>
+ <data name="chkYahooHybrid.Size" type="System.Drawing.Size, System.Drawing">
+ <value>56, 17</value>
+ </data>
+ <data name="chkYahooHybrid.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
+ </data>
+ <data name="chkYahooHybrid.Text" xml:space="preserve">
+ <value>Hybrid</value>
+ </data>
+ <data name=">>chkYahooHybrid.Name" xml:space="preserve">
+ <value>chkYahooHybrid</value>
+ </data>
+ <data name=">>chkYahooHybrid.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkYahooHybrid.Parent" xml:space="preserve">
+ <value>groupBox3</value>
+ </data>
+ <data name=">>chkYahooHybrid.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
More information about the mapguide-commits
mailing list