[mapguide-commits] r9840 - in trunk/MgDev: . Doc/samples Doc/samples/clientsamples/commercial Doc/samples/clientsamples/hybrid Doc/samples/clientsamples/mixed Doc/samples/clientsamples/mvt Doc/samples/clientsamples/selection Doc/samples/clientsamples/tiled Doc/samples/clientsamples/untiled Doc/samples/clientsamples/wms Doc/samples/clientsamples/xyz
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu May 27 05:31:38 PDT 2021
Author: jng
Date: 2021-05-27 05:31:37 -0700 (Thu, 27 May 2021)
New Revision: 9840
Added:
trunk/MgDev/Doc/samples/clientsamples/
Removed:
trunk/MgDev/Doc/samples/ol2samples/
Modified:
trunk/MgDev/Doc/samples/CMakeLists.txt
trunk/MgDev/Doc/samples/clientsamples/commercial/index.html
trunk/MgDev/Doc/samples/clientsamples/hybrid/index.html
trunk/MgDev/Doc/samples/clientsamples/mixed/index.html
trunk/MgDev/Doc/samples/clientsamples/mvt/index.html
trunk/MgDev/Doc/samples/clientsamples/selection/index.html
trunk/MgDev/Doc/samples/clientsamples/tiled/index.html
trunk/MgDev/Doc/samples/clientsamples/untiled/index.html
trunk/MgDev/Doc/samples/clientsamples/wms/index.html
trunk/MgDev/Doc/samples/clientsamples/xyz/index_ol.html
trunk/MgDev/Doc/samples/samples.php
trunk/MgDev/build.bat
Log:
#2810: Rename ol2samples to clientsamples to make it clear that this folder is the home of client-side MapGuide application examples that may not exclusively use OpenLayers.
Modified: trunk/MgDev/Doc/samples/CMakeLists.txt
===================================================================
--- trunk/MgDev/Doc/samples/CMakeLists.txt 2021-04-16 12:10:44 UTC (rev 9839)
+++ trunk/MgDev/Doc/samples/CMakeLists.txt 2021-05-27 12:31:37 UTC (rev 9840)
@@ -1,5 +1,5 @@
install(FILES samples.php DESTINATION ${MG_WWWROOT})
install(
- DIRECTORY javasamples javaviewersample ol2samples phpsamples phpviewersample
+ DIRECTORY javasamples javaviewersample clientsamples phpsamples phpviewersample
DESTINATION ${MG_WWWROOT}
)
\ No newline at end of file
Modified: trunk/MgDev/Doc/samples/clientsamples/commercial/index.html
===================================================================
--- trunk/MgDev/Doc/samples/ol2samples/commercial/index.html 2021-04-16 12:10:44 UTC (rev 9839)
+++ trunk/MgDev/Doc/samples/clientsamples/commercial/index.html 2021-05-27 12:31:37 UTC (rev 9840)
@@ -21,7 +21,7 @@
<script type="text/javascript" src="../assets/legend.js"></script>
<script type="text/javascript">
- //This sample is assumed to be hosted at http://servername/mapguide/ol2samples/untiled/index.html
+ //This sample is assumed to be hosted at http://servername/mapguide/clientsamples/untiled/index.html
var mapAgentUrl = "../../mapagent/mapagent.fcgi";
//Various features you can include in the CREATERUNTIMEMAP response.
Modified: trunk/MgDev/Doc/samples/clientsamples/hybrid/index.html
===================================================================
--- trunk/MgDev/Doc/samples/ol2samples/hybrid/index.html 2021-04-16 12:10:44 UTC (rev 9839)
+++ trunk/MgDev/Doc/samples/clientsamples/hybrid/index.html 2021-05-27 12:31:37 UTC (rev 9840)
@@ -45,7 +45,7 @@
<script type="text/javascript" src="../assets/legend_ol.js"></script>
<script type="text/javascript">
- //This sample is assumed to be hosted at http://servername/mapguide/ol2samples/hybrid/index.html
+ //This sample is assumed to be hosted at http://servername/mapguide/clientsamples/hybrid/index.html
var mapAgentUrl = "../../mapagent/mapagent.fcgi";
//Various features you can include in the CREATERUNTIMEMAP response.
Modified: trunk/MgDev/Doc/samples/clientsamples/mixed/index.html
===================================================================
--- trunk/MgDev/Doc/samples/ol2samples/mixed/index.html 2021-04-16 12:10:44 UTC (rev 9839)
+++ trunk/MgDev/Doc/samples/clientsamples/mixed/index.html 2021-05-27 12:31:37 UTC (rev 9840)
@@ -17,7 +17,7 @@
<script type="text/javascript" src="../assets/legend.js"></script>
<script type="text/javascript">
- //This sample is assumed to be hosted at http://servername/mapguide/ol2samples/untiled/index.html
+ //This sample is assumed to be hosted at http://servername/mapguide/clientsamples/untiled/index.html
var mapAgentUrl = "../../mapagent/mapagent.fcgi";
//Various features you can include in the CREATERUNTIMEMAP response.
Modified: trunk/MgDev/Doc/samples/clientsamples/mvt/index.html
===================================================================
--- trunk/MgDev/Doc/samples/ol2samples/mvt/index.html 2021-04-16 12:10:44 UTC (rev 9839)
+++ trunk/MgDev/Doc/samples/clientsamples/mvt/index.html 2021-05-27 12:31:37 UTC (rev 9840)
@@ -28,7 +28,7 @@
<script type="text/javascript" src="../assets/jquery-1.10.2.min.js"></script>
<script type="text/javascript">
- //This sample is assumed to be hosted at http://servername/mapguide/ol2samples/xyz/index_ol.html
+ //This sample is assumed to be hosted at http://servername/mapguide/clientsamples/xyz/index_ol.html
var mapAgentUrl = "../../mapagent/mapagent.fcgi";
var layerStyleCache = {};
Modified: trunk/MgDev/Doc/samples/clientsamples/selection/index.html
===================================================================
--- trunk/MgDev/Doc/samples/ol2samples/selection/index.html 2021-04-16 12:10:44 UTC (rev 9839)
+++ trunk/MgDev/Doc/samples/clientsamples/selection/index.html 2021-05-27 12:31:37 UTC (rev 9840)
@@ -21,7 +21,7 @@
<script type="text/javascript" src="../assets/legend.js"></script>
<script type="text/javascript">
- //This sample is assumed to be hosted at http://servername/mapguide/ol2samples/untiled/index.html
+ //This sample is assumed to be hosted at http://servername/mapguide/clientsamples/untiled/index.html
var mapAgentUrl = "../../mapagent/mapagent.fcgi";
//Various features you can include in the CREATERUNTIMEMAP response.
Modified: trunk/MgDev/Doc/samples/clientsamples/tiled/index.html
===================================================================
--- trunk/MgDev/Doc/samples/ol2samples/tiled/index.html 2021-04-16 12:10:44 UTC (rev 9839)
+++ trunk/MgDev/Doc/samples/clientsamples/tiled/index.html 2021-05-27 12:31:37 UTC (rev 9840)
@@ -20,7 +20,7 @@
<script type="text/javascript" src="../assets/legend.js"></script>
<script type="text/javascript">
- //This sample is assumed to be hosted at http://servername/mapguide/ol2samples/tiled/index.html
+ //This sample is assumed to be hosted at http://servername/mapguide/clientsamples/tiled/index.html
var mapAgentUrl = "../../mapagent/mapagent.fcgi";
//Various features you can include in the CREATERUNTIMEMAP response.
Modified: trunk/MgDev/Doc/samples/clientsamples/untiled/index.html
===================================================================
--- trunk/MgDev/Doc/samples/ol2samples/untiled/index.html 2021-04-16 12:10:44 UTC (rev 9839)
+++ trunk/MgDev/Doc/samples/clientsamples/untiled/index.html 2021-05-27 12:31:37 UTC (rev 9840)
@@ -17,7 +17,7 @@
<script type="text/javascript" src="../assets/legend.js"></script>
<script type="text/javascript">
- //This sample is assumed to be hosted at http://servername/mapguide/ol2samples/untiled/index.html
+ //This sample is assumed to be hosted at http://servername/mapguide/clientsamples/untiled/index.html
var mapAgentUrl = "../../mapagent/mapagent.fcgi";
//Various features you can include in the CREATERUNTIMEMAP response.
Modified: trunk/MgDev/Doc/samples/clientsamples/wms/index.html
===================================================================
--- trunk/MgDev/Doc/samples/ol2samples/wms/index.html 2021-04-16 12:10:44 UTC (rev 9839)
+++ trunk/MgDev/Doc/samples/clientsamples/wms/index.html 2021-05-27 12:31:37 UTC (rev 9840)
@@ -12,7 +12,7 @@
<script type="text/javascript" src="../assets/jquery-1.10.2.min.js"></script>
<script type="text/javascript">
- //This sample is assumed to be hosted at http://servername/mapguide/ol2samples/xyz/index_ol.html
+ //This sample is assumed to be hosted at http://servername/mapguide/clientsamples/xyz/index_ol.html
var mapAgentUrl = "../../mapagent/mapagent.fcgi";
$(document).ready(function() {
Modified: trunk/MgDev/Doc/samples/clientsamples/xyz/index_ol.html
===================================================================
--- trunk/MgDev/Doc/samples/ol2samples/xyz/index_ol.html 2021-04-16 12:10:44 UTC (rev 9839)
+++ trunk/MgDev/Doc/samples/clientsamples/xyz/index_ol.html 2021-05-27 12:31:37 UTC (rev 9840)
@@ -12,7 +12,7 @@
<script type="text/javascript" src="../assets/jquery-1.10.2.min.js"></script>
<script type="text/javascript">
- //This sample is assumed to be hosted at http://servername/mapguide/ol2samples/xyz/index_ol.html
+ //This sample is assumed to be hosted at http://servername/mapguide/clientsamples/xyz/index_ol.html
var mapAgentUrl = "../../mapagent/mapagent.fcgi";
$(document).ready(function() {
Modified: trunk/MgDev/Doc/samples/samples.php
===================================================================
--- trunk/MgDev/Doc/samples/samples.php 2021-04-16 12:10:44 UTC (rev 9839)
+++ trunk/MgDev/Doc/samples/samples.php 2021-05-27 12:31:37 UTC (rev 9840)
@@ -11,7 +11,7 @@
$hasPhpViewerSample = is_installed("phpviewersample");
$hasJavaDevGuide = is_installed("javasamples");
$hasJavaViewerSample = is_installed("javaviewersample");
-$hasOL2Samples = is_installed("ol2samples");
+$hasClientSamples = is_installed("clientsamples");
$hasDotNet = $hasDotNetDevGuide || $hasDotNetViewerSample;
$hasPhp = $hasPhpDevGuide || $hasPhpViewerSample;
@@ -61,7 +61,7 @@
<ul>
<li>AJAX Viewer</li>
<li>MapGuide Web Extensions API</li>
- <? if ($hasOL2Samples) {?>
+ <? if ($hasClientSamples) {?>
<li>OpenLayers integration</li>
<? } ?>
</ul>
@@ -68,8 +68,8 @@
<p>For more code samples, visit the <a href="http://trac.osgeo.org/mapguide/wiki/CodeSamples">Community Code Samples</a> page on the MapGuide Open Source wiki</p>
<p><strong>NOTE: You should download the <a href="http://download.osgeo.org/mapguide/releases/2.0.0/samples/Sheboygan.mgp">Sheboygan Dataset</a> and load this in via the <a href="mapadmin/login.php">MapGuide Site Administrator</a> before running any of these samples</strong></p>
<p><strong>NOTE: Some samples may not be available because you did not choose to enable this feature from the Windows installer.</strong></p>
- <? if ($hasOL2Samples) { ?>
- <p><strong>NOTE: Some OpenLayers integration samples require some sample resources to be loaded. <a href="ol2samples/data/load.php">Click here</a> to load these resources</strong></p>
+ <? if ($hasClientSamples) { ?>
+ <p><strong>NOTE: Some OpenLayers integration samples require some sample resources to be loaded. <a href="clientsamples/data/load.php">Click here</a> to load these resources</strong></p>
<? } ?>
<p>Click on a link below to go to that particular sample</p>
<? if ($hasNothing) { ?>
@@ -111,23 +111,23 @@
<? } ?>
</ul>
<? } ?>
- <? if ($hasOL2Samples) { ?>
+ <? if ($hasClientSamples) { ?>
<p class="sample-header">MapGuide with <a href="http://www.openlayers.org/two">OpenLayers 2</a></p>
<ul>
- <li><a href="ol2samples/untiled/index.html">Basic Sheboygan un-tiled map example with basic legend</a></li>
- <li><a href="ol2samples/tiled/index.html">Basic Sheboygan tiled map example</a></li>
- <li><a href="ol2samples/selection/index.html">Basic Sheboygan un-tiled map example with selection</a></li>
- <li><a href="ol2samples/mixed/index.html">Basic Sheboygan mixed map (tiled and untiled) example</a></li>
- <li><a href="ol2samples/commercial/index.html">Sheboygan map with Google/OSM layers</a></li>
- <li><a href="ol2samples/xyz/index.html">Sheboygan map as XYZ layer</a></li>
+ <li><a href="clientsamples/untiled/index.html">Basic Sheboygan un-tiled map example with basic legend</a></li>
+ <li><a href="clientsamples/tiled/index.html">Basic Sheboygan tiled map example</a></li>
+ <li><a href="clientsamples/selection/index.html">Basic Sheboygan un-tiled map example with selection</a></li>
+ <li><a href="clientsamples/mixed/index.html">Basic Sheboygan mixed map (tiled and untiled) example</a></li>
+ <li><a href="clientsamples/commercial/index.html">Sheboygan map with Google/OSM layers</a></li>
+ <li><a href="clientsamples/xyz/index.html">Sheboygan map as XYZ layer</a></li>
</ul>
<p class="sample-header">MapGuide with <a href="http://www.openlayers.org">OpenLayers</a></p>
<ul>
- <li><a href="ol2samples/hybrid/index.html">Open any map or tile set</a></li>
- <li><a href="ol2samples/xyz/index_ol.html">Sheboygan map as XYZ layer</a></li>
- <li><a href="ol2samples/utfgrid/index.html">Sheboygan map as XYZ layer with UTFGrid interaction tiles</a></li>
- <li><a href="ol2samples/wms/index.html">Sheboygan map as WMS layers</a></li>
- <li><a href="ol2samples/mvt/index.html">Sheboygan map as Mapbox Vector Tiles</a></li>
+ <li><a href="clientsamples/hybrid/index.html">Open any map or tile set</a></li>
+ <li><a href="clientsamples/xyz/index_ol.html">Sheboygan map as XYZ layer</a></li>
+ <li><a href="clientsamples/utfgrid/index.html">Sheboygan map as XYZ layer with UTFGrid interaction tiles</a></li>
+ <li><a href="clientsamples/wms/index.html">Sheboygan map as WMS layers</a></li>
+ <li><a href="clientsamples/mvt/index.html">Sheboygan map as Mapbox Vector Tiles</a></li>
</ul>
<? } ?>
<? } ?>
Modified: trunk/MgDev/build.bat
===================================================================
--- trunk/MgDev/build.bat 2021-04-16 12:10:44 UTC (rev 9839)
+++ trunk/MgDev/build.bat 2021-05-27 12:31:37 UTC (rev 9840)
@@ -368,7 +368,7 @@
echo [install]: Developer's Guide Sample Code (DotNet)
%XCOPY% "%MG_DOC_DEVGUIDE_SAMPLES%\dotnetviewersample" "%MG_OUTPUT_WEB%\www\dotnetviewersample" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
echo [install]: OpenLayers Samples
-%XCOPY% "%MG_DOC_DEVGUIDE_SAMPLES%\ol2samples" "%MG_OUTPUT_WEB%\www\ol2samples" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
+%XCOPY% "%MG_DOC_DEVGUIDE_SAMPLES%\clientsamples" "%MG_OUTPUT_WEB%\www\clientsamples" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
echo [install]: Samples landing page
copy /Y "%MG_DOC_DEVGUIDE_SAMPLES%\samples.php" "%MG_OUTPUT_WEB%\www"
echo [install]: Viewer API documentation
More information about the mapguide-commits
mailing list