[mapguide-commits] r6784 - in trunk/MgDev: . Common/Stylization Desktop Doc/samples/dotnetsamples Doc/samples/javasamples Doc/samples/phpsamples Server/src/Services/Feature Server/src/Services/Mapping Web/src/mapadmin/HelpDocs Web/src/mapviewerjava Web/src/mapviewernet Web/src/mapviewerphp Web/src/viewerfiles
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Jun 18 06:31:49 PDT 2012
Author: jng
Date: 2012-06-18 06:31:48 -0700 (Mon, 18 Jun 2012)
New Revision: 6784
Added:
trunk/MgDev/Doc/samples/dotnetsamples/WebLayout.xml
trunk/MgDev/Doc/samples/dotnetsamples/readme.txt
trunk/MgDev/Doc/samples/javasamples/WebLayout.xml
trunk/MgDev/Doc/samples/javasamples/readme.txt
trunk/MgDev/Doc/samples/phpsamples/WebLayout.xml
Removed:
trunk/MgDev/Doc/samples/dotnetsamples/AspNetSamples.mgp
trunk/MgDev/Doc/samples/javasamples/JavaSamples.mgp
trunk/MgDev/Doc/samples/phpsamples/PHPSamples.mgp
Modified:
trunk/MgDev/
trunk/MgDev/Common/Stylization/SE_Renderer.cpp
trunk/MgDev/Desktop/
trunk/MgDev/Doc/samples/dotnetsamples/main.aspx
trunk/MgDev/Doc/samples/javasamples/main.jsp
trunk/MgDev/Doc/samples/phpsamples/main.php
trunk/MgDev/Doc/samples/phpsamples/readme.txt
trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp
trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
trunk/MgDev/Web/src/mapadmin/HelpDocs/
trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm
trunk/MgDev/Web/src/mapviewerjava/getselectedfeatures.jsp
trunk/MgDev/Web/src/mapviewernet/getselectedfeatures.aspx
trunk/MgDev/Web/src/mapviewerphp/getselectedfeatures.php
trunk/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php
trunk/MgDev/Web/src/viewerfiles/
trunk/MgDev/Web/src/viewerfiles/quickplot.js
Log:
Merge in 2.4 branch fixes for #2029 and #1780
Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev:6749-6756
/sandbox/rfc94:5099-5163
+ /branches/2.4/MgDev:6749-6756,6777-6783
/sandbox/rfc94:5099-5163
Property changes on: trunk/MgDev/Common/Stylization/SE_Renderer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Common/Stylization/SE_Renderer.cpp:6749-6756
/sandbox/adsk/2.4j/Common/Stylization/SE_Renderer.cpp:6327-6445
/sandbox/rfc94/Common/Stylization/SE_Renderer.cpp:5099-5163
/trunk/MgDev/Common/Stylization/SE_Renderer.cpp:6250-6326
+ /branches/2.4/MgDev/Common/Stylization/SE_Renderer.cpp:6749-6756,6777-6783
/sandbox/adsk/2.4j/Common/Stylization/SE_Renderer.cpp:6327-6445
/sandbox/rfc94/Common/Stylization/SE_Renderer.cpp:5099-5163
/trunk/MgDev/Common/Stylization/SE_Renderer.cpp:6250-6326
Property changes on: trunk/MgDev/Desktop
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Desktop:6612-6613,6615-6616,6749-6756
/sandbox/rfc94/Desktop:5099-5163
+ /branches/2.4/MgDev/Desktop:6612-6613,6615-6616,6749-6756,6777-6783
/sandbox/rfc94/Desktop:5099-5163
Deleted: trunk/MgDev/Doc/samples/dotnetsamples/AspNetSamples.mgp
===================================================================
(Binary files differ)
Copied: trunk/MgDev/Doc/samples/dotnetsamples/WebLayout.xml (from rev 6783, branches/2.4/MgDev/Doc/samples/dotnetsamples/WebLayout.xml)
===================================================================
--- trunk/MgDev/Doc/samples/dotnetsamples/WebLayout.xml (rev 0)
+++ trunk/MgDev/Doc/samples/dotnetsamples/WebLayout.xml 2012-06-18 13:31:48 UTC (rev 6784)
@@ -0,0 +1,628 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="WebLayout-1.0.0.xsd">
+ <Title>ASP.net Developer's Guide Samples</Title>
+ <Map>
+ <ResourceId>Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition</ResourceId>
+ <HyperlinkTarget>TaskPane</HyperlinkTarget>
+ </Map>
+ <ToolBar>
+ <Visible>true</Visible>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Print</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Get Printable Page</Command>
+ </Button>
+ <Button xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Measure</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Buffer</Command>
+ </Button>
+ <Button xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </Button>
+ <Button xsi:type="FlyoutItemType">
+ <Function>Flyout</Function>
+ <Label>Zoom</Label>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Previous View</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Next View</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Initial Map View</Command>
+ </SubItem>
+ </Button>
+ <Button xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom Rectangle</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom In</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom Out</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom</Command>
+ </Button>
+ <Button xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Select</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Pan</Command>
+ </Button>
+ </ToolBar>
+ <InformationPane>
+ <Visible>true</Visible>
+ <Width>200</Width>
+ <LegendVisible>true</LegendVisible>
+ <PropertiesVisible>true</PropertiesVisible>
+ </InformationPane>
+ <ContextMenu>
+ <Visible>true</Visible>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Print</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Refresh Map</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Copy</Command>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Pan</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom Rectangle</Command>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom In</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom Out</Command>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="FlyoutItemType">
+ <Function>Flyout</Function>
+ <Label>Zoom</Label>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Initial Map View</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Previous View</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Next View</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Initial Center and Scale</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom Selection</Command>
+ </SubItem>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Select</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Clear Selection</Command>
+ </MenuItem>
+ <MenuItem xsi:type="FlyoutItemType">
+ <Function>Flyout</Function>
+ <Label>Select More</Label>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Select Radius</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Select Polygon</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Select Within</Command>
+ </SubItem>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Buffer</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Measure</Command>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>View Options</Command>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Help</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>About</Command>
+ </MenuItem>
+ </ContextMenu>
+ <TaskPane>
+ <Visible>true</Visible>
+ <Width>250</Width>
+ <TaskBar>
+ <Visible>true</Visible>
+ <Home>
+ <Name>Home</Name>
+ <Tooltip>Return to home task page</Tooltip>
+ <Description>Return to home task page</Description>
+ <ImageURL>../stdicons/icon_home.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_home_disabled.gif</DisabledImageURL>
+ </Home>
+ <Forward>
+ <Name>Forward</Name>
+ <Tooltip>Forward to next task page</Tooltip>
+ <Description>Forward to next task page</Description>
+ <ImageURL>../stdicons/icon_forward.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_forward_disabled.gif</DisabledImageURL>
+ </Forward>
+ <Back>
+ <Name>Back</Name>
+ <Tooltip>Return to previous task page</Tooltip>
+ <Description>Return to previous task page</Description>
+ <ImageURL>../stdicons/icon_back.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_back_disabled.gif</DisabledImageURL>
+ </Back>
+ <Tasks>
+ <Name>Tasks</Name>
+ <Tooltip>Task list</Tooltip>
+ <Description>View a list of available tasks</Description>
+ <ImageURL>../stdicons/icon_tasks.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_tasks_disabled.gif</DisabledImageURL>
+ </Tasks>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Overview</Command>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Navigate</Command>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>FindParcels</Command>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>FindAddress</Command>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Plot</Command>
+ </MenuButton>
+ <MenuButton xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Buffer</Command>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Measure</Command>
+ </MenuButton>
+ </TaskBar>
+ <InitialTask>../dotnetsamples/index.aspx</InitialTask>
+ </TaskPane>
+ <StatusBar>
+ <Visible>true</Visible>
+ </StatusBar>
+ <ZoomControl>
+ <Visible>true</Visible>
+ </ZoomControl>
+ <CommandSet>
+ <Command xsi:type="BasicCommandType">
+ <Name>Pan</Name>
+ <Label>Pan</Label>
+ <Tooltip>Pan mode</Tooltip>
+ <Description>Drag the map to view areas out of range</Description>
+ <ImageURL>../stdicons/icon_pan.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_pan_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>Pan</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Pan Up</Name>
+ <Label>Pan Up</Label>
+ <Tooltip>Pan up</Tooltip>
+ <Description>Pan up by a preset increment</Description>
+ <ImageURL>../stdicons/icon_panup.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_panup_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>PanUp</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Pan Down</Name>
+ <Label>Pan Down</Label>
+ <Tooltip>Pan down</Tooltip>
+ <Description>Pan down by a preset increment</Description>
+ <ImageURL>../stdicons/icon_pandown.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_pandown_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>PanDown</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Pan Right</Name>
+ <Label>Pan Right</Label>
+ <Tooltip>Pan right</Tooltip>
+ <Description>Pan right by a preset increment</Description>
+ <ImageURL>../stdicons/icon_panright.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_panright_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>PanRight</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Pan Left</Name>
+ <Label>Pan Left</Label>
+ <Tooltip>Pan left</Tooltip>
+ <Description>Pan left by a preset increment</Description>
+ <ImageURL>../stdicons/icon_panleft.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_panleft_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>PanLeft</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Zoom</Name>
+ <Label>Zoom</Label>
+ <Tooltip>Zoom dynamic</Tooltip>
+ <Description>Zoom dynamically by clicking and dragging</Description>
+ <ImageURL>../stdicons/icon_zoom.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoom_disabled.gif</DisabledImageURL>
+ <TargetViewer>Dwf</TargetViewer>
+ <Action>Zoom</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Zoom In</Name>
+ <Label>Zoom In</Label>
+ <Tooltip>Zoom in</Tooltip>
+ <Description>Zoom in by a preset increment</Description>
+ <ImageURL>../stdicons/icon_zoomin.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomin_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>ZoomIn</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Zoom Out</Name>
+ <Label>Zoom Out</Label>
+ <Tooltip>Zoom out</Tooltip>
+ <Description>Zoom out by a preset increment</Description>
+ <ImageURL>../stdicons/icon_zoomout.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomout_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>ZoomOut</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Zoom Rectangle</Name>
+ <Label>Zoom Rectangle</Label>
+ <Tooltip>Zoom rectangle</Tooltip>
+ <Description>Zoom in on an area</Description>
+ <ImageURL>../stdicons/icon_zoomrect.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomrect_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>ZoomRectangle</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Zoom Selection</Name>
+ <Label>Zoom Selection</Label>
+ <Tooltip>Zoom to selection</Tooltip>
+ <Description>Zoom to extents of selected features</Description>
+ <ImageURL>../stdicons/icon_zoomselect.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomselect_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>ZoomToSelection</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Initial Map View</Name>
+ <Label>Initial Map View</Label>
+ <Tooltip>Initial map view</Tooltip>
+ <Description>Fit the extents of the map to the window</Description>
+ <ImageURL>../stdicons/icon_fitwindow.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_fitwindow_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>FitToWindow</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Previous View</Name>
+ <Label>Previous View</Label>
+ <Tooltip>Previous view</Tooltip>
+ <Description>Go to previous view</Description>
+ <ImageURL>../stdicons/icon_zoomprev.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomprev_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>PreviousView</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Next View</Name>
+ <Label>Next View</Label>
+ <Tooltip>Next view</Tooltip>
+ <Description>Go to next view</Description>
+ <ImageURL>../stdicons/icon_zoomnext.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomnext_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>NextView</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Initial Center and Scale</Name>
+ <Label>Initial Center and Scale</Label>
+ <Tooltip>Initial center and scale</Tooltip>
+ <Description>Zoom to initial map center and scale</Description>
+ <ImageURL>../stdicons/icon_restorecenter.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_restorecenter_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>RestoreView</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Select</Name>
+ <Label>Select</Label>
+ <Tooltip>Select mode</Tooltip>
+ <Description>Select features by clicking and dragging</Description>
+ <ImageURL>../stdicons/icon_select.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_select_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>Select</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Select Radius</Name>
+ <Label>Select Radius</Label>
+ <Tooltip>Select radius</Tooltip>
+ <Description>Click and drag to select all features inside the circle</Description>
+ <ImageURL>../stdicons/icon_selectradius.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_selectradius_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>SelectRadius</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Select Polygon</Name>
+ <Label>Select Polygon</Label>
+ <Tooltip>Select polygon</Tooltip>
+ <Description>Create a polygon to select all features that fall within</Description>
+ <ImageURL>../stdicons/icon_selectpolygon.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_selectpolygon_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>SelectPolygon</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Clear Selection</Name>
+ <Label>Clear Selection</Label>
+ <Tooltip>Clear selection</Tooltip>
+ <Description>Clear the current selections</Description>
+ <ImageURL>../stdicons/icon_clearselect.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_clearselect_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>ClearSelection</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Refresh Map</Name>
+ <Label>Refresh Map</Label>
+ <Tooltip>Refresh map</Tooltip>
+ <Description>Refresh map and reload all layers keeping current center and scale</Description>
+ <ImageURL>../stdicons/icon_refreshmap.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_refreshmap_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>Refresh</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Copy</Name>
+ <Label>Copy</Label>
+ <Tooltip>Copy</Tooltip>
+ <Description>Copy current view of map to clipboard</Description>
+ <ImageURL>../stdicons/icon_copy.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_copy_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>CopyMap</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>About</Name>
+ <Label>About</Label>
+ <Tooltip>About</Tooltip>
+ <Description>Display information about this application</Description>
+ <ImageURL/>
+ <DisabledImageURL/>
+ <TargetViewer>All</TargetViewer>
+ <Action>About</Action>
+ </Command>
+ <Command xsi:type="BufferCommandType">
+ <Name>Buffer</Name>
+ <Label>Buffer</Label>
+ <Tooltip>Buffer</Tooltip>
+ <Description>Create buffers around the selected features</Description>
+ <ImageURL>../stdicons/icon_buffer.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_buffer_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ </Command>
+ <Command xsi:type="SelectWithinCommandType">
+ <Name>Select Within</Name>
+ <Label>Select Within</Label>
+ <Tooltip>Select within</Tooltip>
+ <Description>Select features that fall within currently selected areas</Description>
+ <ImageURL>../stdicons/icon_selectwithin.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_selectwithin_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ </Command>
+ <Command xsi:type="PrintCommandType">
+ <Name>Print</Name>
+ <Label>Print</Label>
+ <Tooltip>Print</Tooltip>
+ <Description>Print with optional layout</Description>
+ <ImageURL>../stdicons/icon_print.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_print_disabled.gif</DisabledImageURL>
+ <TargetViewer>Dwf</TargetViewer>
+ </Command>
+ <Command xsi:type="MeasureCommandType">
+ <Name>Measure</Name>
+ <Label>Measure</Label>
+ <Tooltip>Measure</Tooltip>
+ <Description>Measure distances on the map</Description>
+ <ImageURL>../stdicons/icon_measure.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_measure_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ </Command>
+ <Command xsi:type="ViewOptionsCommandType">
+ <Name>View Options</Name>
+ <Label>View Options</Label>
+ <Tooltip>View Options</Tooltip>
+ <Description>View Options</Description>
+ <ImageURL>../stdicons/icon_viewoptions.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_viewoptions_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ </Command>
+ <Command xsi:type="GetPrintablePageCommandType">
+ <Name>Get Printable Page</Name>
+ <Label>Get Printable Page</Label>
+ <Tooltip>Get printable Page</Tooltip>
+ <Description>Get printer-friendly page</Description>
+ <ImageURL>../stdicons/icon_printablepage.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_printablepage_disabled.gif</DisabledImageURL>
+ <TargetViewer>Ajax</TargetViewer>
+ <Target>NewWindow</Target>
+ </Command>
+ <Command xsi:type="HelpCommandType">
+ <Name>Help</Name>
+ <Label>Help</Label>
+ <Tooltip>Help</Tooltip>
+ <Description>Launch help for this application</Description>
+ <ImageURL>../stdicons/icon_help.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_help_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ </Command>
+ <Command xsi:type="InvokeURLCommandType">
+ <Name>Navigate</Name>
+ <Label>Navigate</Label>
+ <Tooltip>Navigate by District</Tooltip>
+ <Description>Navigate the map by municipal district</Description>
+ <ImageURL>../stdicons/icon_invokeurl.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_invokeurl_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ <URL>../phpviewersample/navigatetask.php</URL>
+ <LayerSet/>
+ <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+ </Command>
+ <Command xsi:type="InvokeURLCommandType">
+ <Name>Overview</Name>
+ <Label>Overview</Label>
+ <Tooltip>Display an Overview</Tooltip>
+ <Description>Display an overview of the application</Description>
+ <ImageURL>../stdicons/icon_invokeurl.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_invokeurl_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ <URL>../phpviewersample/overviewtask.php</URL>
+ <LayerSet/>
+ <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+ </Command>
+ <Command xsi:type="InvokeURLCommandType">
+ <Name>FindParcels</Name>
+ <Label>Find Parcels</Label>
+ <Tooltip>Find Parcel By Owner</Tooltip>
+ <Description>Find parcels by owner</Description>
+ <ImageURL>../stdicons/icon_invokeurl.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_invokeurl_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ <URL>../phpviewersample/findparceltask.php</URL>
+ <LayerSet/>
+ <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+ </Command>
+ <Command xsi:type="InvokeURLCommandType">
+ <Name>Plot</Name>
+ <Label>Plot as DWF</Label>
+ <Tooltip>Plot as DWF</Tooltip>
+ <Description>Plot the current map as a DWF</Description>
+ <ImageURL>../stdicons/icon_invokeurl.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_invokeurl_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ <URL>../phpviewersample/plottask.php</URL>
+ <LayerSet/>
+ <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+ </Command>
+ <Command xsi:type="InvokeURLCommandType">
+ <Name>FindAddress</Name>
+ <Label>Find Address</Label>
+ <Tooltip>Find an Address</Tooltip>
+ <Description>Find an address in Sheboygan</Description>
+ <ImageURL>../stdicons/icon_invokeurl.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_invokeurl_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ <URL>../phpviewersample/findaddresstask.php</URL>
+ <LayerSet/>
+ <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+ </Command>
+ </CommandSet>
+</WebLayout>
\ No newline at end of file
Modified: trunk/MgDev/Doc/samples/dotnetsamples/main.aspx
===================================================================
--- trunk/MgDev/Doc/samples/dotnetsamples/main.aspx 2012-06-18 13:13:01 UTC (rev 6783)
+++ trunk/MgDev/Doc/samples/dotnetsamples/main.aspx 2012-06-18 13:31:48 UTC (rev 6784)
@@ -30,13 +30,14 @@
<%
MgSite site = null;
+MgUserInformation userInfo = null;
try
{
// Initialize the web extensions,
MapGuideApi.MgInitializeWebTier(Constants.WebConfigPath);
// Connect to the site server and create a session
- MgUserInformation userInfo = new MgUserInformation("Author", "author");
+ userInfo = new MgUserInformation("Author", "author");
site = new MgSite();
site.Open(userInfo);
}
@@ -53,6 +54,27 @@
// Define some constants
webLayout = "Library://Samples/Layouts/AspNetSamples.WebLayout";
title = "MapGuide Developer's Guide asp.net Samples";
+
+ MgSiteConnection siteConn = new MgSiteConnection();
+ siteConn.Open(userInfo);
+
+ // We check for the existence of the specified WebLayout
+ //
+ // If it doesn't exist, we load a copy from the WebLayout.xml on disk. This is a basic example
+ // of programmatically loading resource content into to the repository.
+ MgResourceService resSvc = (MgResourceService)siteConn.CreateService(MgServiceType.ResourceService);
+ MgResourceIdentifier wlResId = new MgResourceIdentifier(webLayout);
+ if (!resSvc.ResourceExists(wlResId)) {
+ String xmlPath = Server.MapPath("WebLayout.xml");
+ MgByteSource wlByteSource = new MgByteSource(xmlPath);
+ MgByteReader wlByteReader = wlByteSource.GetReader();
+ // NOTE: The Author account generally has write access into the site repository
+ // which is why we're doing it like this.
+ // If this was an Anonymous user, they can't write into the session repository. We would normally
+ // load our content into a session-based repository and modify $webLayout to point to our
+ // session loaded resource
+ resSvc.SetResource(wlResId, wlByteReader, null);
+ }
}
catch (MgException ex)
{
Copied: trunk/MgDev/Doc/samples/dotnetsamples/readme.txt (from rev 6783, branches/2.4/MgDev/Doc/samples/dotnetsamples/readme.txt)
===================================================================
--- trunk/MgDev/Doc/samples/dotnetsamples/readme.txt (rev 0)
+++ trunk/MgDev/Doc/samples/dotnetsamples/readme.txt 2012-06-18 13:31:48 UTC (rev 6784)
@@ -0,0 +1,16 @@
+MapGuide Developer's Guide DotNet Samples README
+------------------------------------------------
+
+This is the complete set of DotNet samples referenced in the MapGuide Developer's Guide
+
+Notes
+-----
+
+These samples assume that MapGuide Open Source is installed in the default location in
+C:\Program Files\OSGeo\MapGuide
+
+If this is not the case edit common/common.aspx and change the paths to match your install location
+
+These samples require a user named "Author" (pass: author) with authoring privileges. This is a default user in a standard MapGuide installation. If you have deleted or modified this user, edit main.php and update with a matching login
+
+These samples require the Sheboygan sample dataset. Load this package first before running the samples.
\ No newline at end of file
Deleted: trunk/MgDev/Doc/samples/javasamples/JavaSamples.mgp
===================================================================
(Binary files differ)
Copied: trunk/MgDev/Doc/samples/javasamples/WebLayout.xml (from rev 6783, branches/2.4/MgDev/Doc/samples/javasamples/WebLayout.xml)
===================================================================
--- trunk/MgDev/Doc/samples/javasamples/WebLayout.xml (rev 0)
+++ trunk/MgDev/Doc/samples/javasamples/WebLayout.xml 2012-06-18 13:31:48 UTC (rev 6784)
@@ -0,0 +1,628 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="WebLayout-1.0.0.xsd">
+ <Title>Java Developer's Guide Samples</Title>
+ <Map>
+ <ResourceId>Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition</ResourceId>
+ <HyperlinkTarget>TaskPane</HyperlinkTarget>
+ </Map>
+ <ToolBar>
+ <Visible>true</Visible>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Print</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Get Printable Page</Command>
+ </Button>
+ <Button xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Measure</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Buffer</Command>
+ </Button>
+ <Button xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </Button>
+ <Button xsi:type="FlyoutItemType">
+ <Function>Flyout</Function>
+ <Label>Zoom</Label>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Previous View</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Next View</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Initial Map View</Command>
+ </SubItem>
+ </Button>
+ <Button xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom Rectangle</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom In</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom Out</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom</Command>
+ </Button>
+ <Button xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Select</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Pan</Command>
+ </Button>
+ </ToolBar>
+ <InformationPane>
+ <Visible>true</Visible>
+ <Width>200</Width>
+ <LegendVisible>true</LegendVisible>
+ <PropertiesVisible>true</PropertiesVisible>
+ </InformationPane>
+ <ContextMenu>
+ <Visible>true</Visible>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Print</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Refresh Map</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Copy</Command>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Pan</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom Rectangle</Command>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom In</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom Out</Command>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="FlyoutItemType">
+ <Function>Flyout</Function>
+ <Label>Zoom</Label>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Initial Map View</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Previous View</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Next View</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Initial Center and Scale</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom Selection</Command>
+ </SubItem>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Select</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Clear Selection</Command>
+ </MenuItem>
+ <MenuItem xsi:type="FlyoutItemType">
+ <Function>Flyout</Function>
+ <Label>Select More</Label>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Select Radius</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Select Polygon</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Select Within</Command>
+ </SubItem>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Buffer</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Measure</Command>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>View Options</Command>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Help</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>About</Command>
+ </MenuItem>
+ </ContextMenu>
+ <TaskPane>
+ <Visible>true</Visible>
+ <Width>250</Width>
+ <TaskBar>
+ <Visible>true</Visible>
+ <Home>
+ <Name>Home</Name>
+ <Tooltip>Return to home task page</Tooltip>
+ <Description>Return to home task page</Description>
+ <ImageURL>../stdicons/icon_home.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_home_disabled.gif</DisabledImageURL>
+ </Home>
+ <Forward>
+ <Name>Forward</Name>
+ <Tooltip>Forward to next task page</Tooltip>
+ <Description>Forward to next task page</Description>
+ <ImageURL>../stdicons/icon_forward.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_forward_disabled.gif</DisabledImageURL>
+ </Forward>
+ <Back>
+ <Name>Back</Name>
+ <Tooltip>Return to previous task page</Tooltip>
+ <Description>Return to previous task page</Description>
+ <ImageURL>../stdicons/icon_back.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_back_disabled.gif</DisabledImageURL>
+ </Back>
+ <Tasks>
+ <Name>Tasks</Name>
+ <Tooltip>Task list</Tooltip>
+ <Description>View a list of available tasks</Description>
+ <ImageURL>../stdicons/icon_tasks.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_tasks_disabled.gif</DisabledImageURL>
+ </Tasks>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Overview</Command>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Navigate</Command>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>FindParcels</Command>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>FindAddress</Command>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Plot</Command>
+ </MenuButton>
+ <MenuButton xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Buffer</Command>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Measure</Command>
+ </MenuButton>
+ </TaskBar>
+ <InitialTask>../javasamples/index.jsp</InitialTask>
+ </TaskPane>
+ <StatusBar>
+ <Visible>true</Visible>
+ </StatusBar>
+ <ZoomControl>
+ <Visible>true</Visible>
+ </ZoomControl>
+ <CommandSet>
+ <Command xsi:type="BasicCommandType">
+ <Name>Pan</Name>
+ <Label>Pan</Label>
+ <Tooltip>Pan mode</Tooltip>
+ <Description>Drag the map to view areas out of range</Description>
+ <ImageURL>../stdicons/icon_pan.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_pan_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>Pan</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Pan Up</Name>
+ <Label>Pan Up</Label>
+ <Tooltip>Pan up</Tooltip>
+ <Description>Pan up by a preset increment</Description>
+ <ImageURL>../stdicons/icon_panup.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_panup_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>PanUp</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Pan Down</Name>
+ <Label>Pan Down</Label>
+ <Tooltip>Pan down</Tooltip>
+ <Description>Pan down by a preset increment</Description>
+ <ImageURL>../stdicons/icon_pandown.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_pandown_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>PanDown</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Pan Right</Name>
+ <Label>Pan Right</Label>
+ <Tooltip>Pan right</Tooltip>
+ <Description>Pan right by a preset increment</Description>
+ <ImageURL>../stdicons/icon_panright.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_panright_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>PanRight</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Pan Left</Name>
+ <Label>Pan Left</Label>
+ <Tooltip>Pan left</Tooltip>
+ <Description>Pan left by a preset increment</Description>
+ <ImageURL>../stdicons/icon_panleft.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_panleft_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>PanLeft</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Zoom</Name>
+ <Label>Zoom</Label>
+ <Tooltip>Zoom dynamic</Tooltip>
+ <Description>Zoom dynamically by clicking and dragging</Description>
+ <ImageURL>../stdicons/icon_zoom.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoom_disabled.gif</DisabledImageURL>
+ <TargetViewer>Dwf</TargetViewer>
+ <Action>Zoom</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Zoom In</Name>
+ <Label>Zoom In</Label>
+ <Tooltip>Zoom in</Tooltip>
+ <Description>Zoom in by a preset increment</Description>
+ <ImageURL>../stdicons/icon_zoomin.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomin_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>ZoomIn</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Zoom Out</Name>
+ <Label>Zoom Out</Label>
+ <Tooltip>Zoom out</Tooltip>
+ <Description>Zoom out by a preset increment</Description>
+ <ImageURL>../stdicons/icon_zoomout.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomout_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>ZoomOut</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Zoom Rectangle</Name>
+ <Label>Zoom Rectangle</Label>
+ <Tooltip>Zoom rectangle</Tooltip>
+ <Description>Zoom in on an area</Description>
+ <ImageURL>../stdicons/icon_zoomrect.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomrect_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>ZoomRectangle</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Zoom Selection</Name>
+ <Label>Zoom Selection</Label>
+ <Tooltip>Zoom to selection</Tooltip>
+ <Description>Zoom to extents of selected features</Description>
+ <ImageURL>../stdicons/icon_zoomselect.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomselect_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>ZoomToSelection</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Initial Map View</Name>
+ <Label>Initial Map View</Label>
+ <Tooltip>Initial map view</Tooltip>
+ <Description>Fit the extents of the map to the window</Description>
+ <ImageURL>../stdicons/icon_fitwindow.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_fitwindow_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>FitToWindow</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Previous View</Name>
+ <Label>Previous View</Label>
+ <Tooltip>Previous view</Tooltip>
+ <Description>Go to previous view</Description>
+ <ImageURL>../stdicons/icon_zoomprev.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomprev_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>PreviousView</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Next View</Name>
+ <Label>Next View</Label>
+ <Tooltip>Next view</Tooltip>
+ <Description>Go to next view</Description>
+ <ImageURL>../stdicons/icon_zoomnext.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomnext_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>NextView</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Initial Center and Scale</Name>
+ <Label>Initial Center and Scale</Label>
+ <Tooltip>Initial center and scale</Tooltip>
+ <Description>Zoom to initial map center and scale</Description>
+ <ImageURL>../stdicons/icon_restorecenter.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_restorecenter_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>RestoreView</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Select</Name>
+ <Label>Select</Label>
+ <Tooltip>Select mode</Tooltip>
+ <Description>Select features by clicking and dragging</Description>
+ <ImageURL>../stdicons/icon_select.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_select_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>Select</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Select Radius</Name>
+ <Label>Select Radius</Label>
+ <Tooltip>Select radius</Tooltip>
+ <Description>Click and drag to select all features inside the circle</Description>
+ <ImageURL>../stdicons/icon_selectradius.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_selectradius_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>SelectRadius</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Select Polygon</Name>
+ <Label>Select Polygon</Label>
+ <Tooltip>Select polygon</Tooltip>
+ <Description>Create a polygon to select all features that fall within</Description>
+ <ImageURL>../stdicons/icon_selectpolygon.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_selectpolygon_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>SelectPolygon</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Clear Selection</Name>
+ <Label>Clear Selection</Label>
+ <Tooltip>Clear selection</Tooltip>
+ <Description>Clear the current selections</Description>
+ <ImageURL>../stdicons/icon_clearselect.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_clearselect_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>ClearSelection</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Refresh Map</Name>
+ <Label>Refresh Map</Label>
+ <Tooltip>Refresh map</Tooltip>
+ <Description>Refresh map and reload all layers keeping current center and scale</Description>
+ <ImageURL>../stdicons/icon_refreshmap.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_refreshmap_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>Refresh</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Copy</Name>
+ <Label>Copy</Label>
+ <Tooltip>Copy</Tooltip>
+ <Description>Copy current view of map to clipboard</Description>
+ <ImageURL>../stdicons/icon_copy.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_copy_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>CopyMap</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>About</Name>
+ <Label>About</Label>
+ <Tooltip>About</Tooltip>
+ <Description>Display information about this application</Description>
+ <ImageURL/>
+ <DisabledImageURL/>
+ <TargetViewer>All</TargetViewer>
+ <Action>About</Action>
+ </Command>
+ <Command xsi:type="BufferCommandType">
+ <Name>Buffer</Name>
+ <Label>Buffer</Label>
+ <Tooltip>Buffer</Tooltip>
+ <Description>Create buffers around the selected features</Description>
+ <ImageURL>../stdicons/icon_buffer.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_buffer_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ </Command>
+ <Command xsi:type="SelectWithinCommandType">
+ <Name>Select Within</Name>
+ <Label>Select Within</Label>
+ <Tooltip>Select within</Tooltip>
+ <Description>Select features that fall within currently selected areas</Description>
+ <ImageURL>../stdicons/icon_selectwithin.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_selectwithin_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ </Command>
+ <Command xsi:type="PrintCommandType">
+ <Name>Print</Name>
+ <Label>Print</Label>
+ <Tooltip>Print</Tooltip>
+ <Description>Print with optional layout</Description>
+ <ImageURL>../stdicons/icon_print.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_print_disabled.gif</DisabledImageURL>
+ <TargetViewer>Dwf</TargetViewer>
+ </Command>
+ <Command xsi:type="MeasureCommandType">
+ <Name>Measure</Name>
+ <Label>Measure</Label>
+ <Tooltip>Measure</Tooltip>
+ <Description>Measure distances on the map</Description>
+ <ImageURL>../stdicons/icon_measure.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_measure_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ </Command>
+ <Command xsi:type="ViewOptionsCommandType">
+ <Name>View Options</Name>
+ <Label>View Options</Label>
+ <Tooltip>View Options</Tooltip>
+ <Description>View Options</Description>
+ <ImageURL>../stdicons/icon_viewoptions.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_viewoptions_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ </Command>
+ <Command xsi:type="GetPrintablePageCommandType">
+ <Name>Get Printable Page</Name>
+ <Label>Get Printable Page</Label>
+ <Tooltip>Get printable Page</Tooltip>
+ <Description>Get printer-friendly page</Description>
+ <ImageURL>../stdicons/icon_printablepage.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_printablepage_disabled.gif</DisabledImageURL>
+ <TargetViewer>Ajax</TargetViewer>
+ <Target>NewWindow</Target>
+ </Command>
+ <Command xsi:type="HelpCommandType">
+ <Name>Help</Name>
+ <Label>Help</Label>
+ <Tooltip>Help</Tooltip>
+ <Description>Launch help for this application</Description>
+ <ImageURL>../stdicons/icon_help.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_help_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ </Command>
+ <Command xsi:type="InvokeURLCommandType">
+ <Name>Navigate</Name>
+ <Label>Navigate</Label>
+ <Tooltip>Navigate by District</Tooltip>
+ <Description>Navigate the map by municipal district</Description>
+ <ImageURL>../stdicons/icon_invokeurl.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_invokeurl_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ <URL>../phpviewersample/navigatetask.php</URL>
+ <LayerSet/>
+ <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+ </Command>
+ <Command xsi:type="InvokeURLCommandType">
+ <Name>Overview</Name>
+ <Label>Overview</Label>
+ <Tooltip>Display an Overview</Tooltip>
+ <Description>Display an overview of the application</Description>
+ <ImageURL>../stdicons/icon_invokeurl.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_invokeurl_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ <URL>../phpviewersample/overviewtask.php</URL>
+ <LayerSet/>
+ <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+ </Command>
+ <Command xsi:type="InvokeURLCommandType">
+ <Name>FindParcels</Name>
+ <Label>Find Parcels</Label>
+ <Tooltip>Find Parcel By Owner</Tooltip>
+ <Description>Find parcels by owner</Description>
+ <ImageURL>../stdicons/icon_invokeurl.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_invokeurl_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ <URL>../phpviewersample/findparceltask.php</URL>
+ <LayerSet/>
+ <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+ </Command>
+ <Command xsi:type="InvokeURLCommandType">
+ <Name>Plot</Name>
+ <Label>Plot as DWF</Label>
+ <Tooltip>Plot as DWF</Tooltip>
+ <Description>Plot the current map as a DWF</Description>
+ <ImageURL>../stdicons/icon_invokeurl.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_invokeurl_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ <URL>../phpviewersample/plottask.php</URL>
+ <LayerSet/>
+ <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+ </Command>
+ <Command xsi:type="InvokeURLCommandType">
+ <Name>FindAddress</Name>
+ <Label>Find Address</Label>
+ <Tooltip>Find an Address</Tooltip>
+ <Description>Find an address in Sheboygan</Description>
+ <ImageURL>../stdicons/icon_invokeurl.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_invokeurl_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ <URL>../phpviewersample/findaddresstask.php</URL>
+ <LayerSet/>
+ <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+ </Command>
+ </CommandSet>
+</WebLayout>
\ No newline at end of file
Modified: trunk/MgDev/Doc/samples/javasamples/main.jsp
===================================================================
--- trunk/MgDev/Doc/samples/javasamples/main.jsp 2012-06-18 13:13:01 UTC (rev 6783)
+++ trunk/MgDev/Doc/samples/javasamples/main.jsp 2012-06-18 13:31:48 UTC (rev 6784)
@@ -32,7 +32,7 @@
String configPath = realpath + "webconfig.ini";
MapGuideJavaApi.MgInitializeWebTier( configPath );
- MgUserInformation userInfo = new MgUserInformation("Anonymous", "");
+ MgUserInformation userInfo = new MgUserInformation("Author", "author");
MgSite site = new MgSite();
site.Open(userInfo);
@@ -40,6 +40,27 @@
String sessionId = site.CreateSession();
String title = "JSP Samples";
String webLayout = "Library://Samples/Layouts/JavaSamples.WebLayout";
+
+ MgSiteConnection siteConn = new MgSiteConnection();
+ siteConn.Open(userInfo);
+
+ // We check for the existence of the specified WebLayout
+ //
+ // If it doesn't exist, we load a copy from the WebLayout.xml on disk. This is a basic example
+ // of programmatically loading resource content into to the repository.
+ MgResourceService resSvc = (MgResourceService)siteConn.CreateService(MgServiceType.ResourceService);
+ MgResourceIdentifier wlResId = new MgResourceIdentifier(webLayout);
+ if (!resSvc.ResourceExists(wlResId)) {
+ String xmlPath = realpath + File.separator + "/javasamples/WebLayout.xml";
+ MgByteSource wlByteSource = new MgByteSource(xmlPath);
+ MgByteReader wlByteReader = wlByteSource.GetReader();
+ // NOTE: The Author account generally has write access into the site repository
+ // which is why we're doing it like this.
+ // If this was an Anonymous user, they can't write into the session repository. We would normally
+ // load our content into a session-based repository and modify $webLayout to point to our
+ // session loaded resource
+ resSvc.SetResource(wlResId, wlByteReader, null);
+ }
%>
<html>
<head>
Copied: trunk/MgDev/Doc/samples/javasamples/readme.txt (from rev 6783, branches/2.4/MgDev/Doc/samples/javasamples/readme.txt)
===================================================================
--- trunk/MgDev/Doc/samples/javasamples/readme.txt (rev 0)
+++ trunk/MgDev/Doc/samples/javasamples/readme.txt 2012-06-18 13:31:48 UTC (rev 6784)
@@ -0,0 +1,16 @@
+MapGuide Developer's Guide Java Samples README
+----------------------------------------------
+
+This is the complete set of Java samples referenced in the MapGuide Developer's Guide
+
+Notes
+-----
+
+These samples assume that MapGuide Open Source is installed in the default location in
+C:\Program Files\OSGeo\MapGuide
+
+If this is not the case edit common/common.jsp and change the paths to match your install location
+
+These samples require a user named "Author" (pass: author) with authoring privileges. This is a default user in a standard MapGuide installation. If you have deleted or modified this user, edit main.php and update with a matching login
+
+These samples require the Sheboygan sample dataset. Load this package first before running the samples.
\ No newline at end of file
Deleted: trunk/MgDev/Doc/samples/phpsamples/PHPSamples.mgp
===================================================================
(Binary files differ)
Copied: trunk/MgDev/Doc/samples/phpsamples/WebLayout.xml (from rev 6783, branches/2.4/MgDev/Doc/samples/phpsamples/WebLayout.xml)
===================================================================
--- trunk/MgDev/Doc/samples/phpsamples/WebLayout.xml (rev 0)
+++ trunk/MgDev/Doc/samples/phpsamples/WebLayout.xml 2012-06-18 13:31:48 UTC (rev 6784)
@@ -0,0 +1,628 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="WebLayout-1.0.0.xsd">
+ <Title>PHP Developer's Guide Samples</Title>
+ <Map>
+ <ResourceId>Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition</ResourceId>
+ <HyperlinkTarget>TaskPane</HyperlinkTarget>
+ </Map>
+ <ToolBar>
+ <Visible>true</Visible>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Print</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Get Printable Page</Command>
+ </Button>
+ <Button xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Measure</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Buffer</Command>
+ </Button>
+ <Button xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </Button>
+ <Button xsi:type="FlyoutItemType">
+ <Function>Flyout</Function>
+ <Label>Zoom</Label>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Previous View</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Next View</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Initial Map View</Command>
+ </SubItem>
+ </Button>
+ <Button xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom Rectangle</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom In</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom Out</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom</Command>
+ </Button>
+ <Button xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Select</Command>
+ </Button>
+ <Button xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Pan</Command>
+ </Button>
+ </ToolBar>
+ <InformationPane>
+ <Visible>true</Visible>
+ <Width>200</Width>
+ <LegendVisible>true</LegendVisible>
+ <PropertiesVisible>true</PropertiesVisible>
+ </InformationPane>
+ <ContextMenu>
+ <Visible>true</Visible>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Print</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Refresh Map</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Copy</Command>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Pan</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom Rectangle</Command>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom In</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom Out</Command>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="FlyoutItemType">
+ <Function>Flyout</Function>
+ <Label>Zoom</Label>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Initial Map View</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Previous View</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Next View</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Initial Center and Scale</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Zoom Selection</Command>
+ </SubItem>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Select</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Clear Selection</Command>
+ </MenuItem>
+ <MenuItem xsi:type="FlyoutItemType">
+ <Function>Flyout</Function>
+ <Label>Select More</Label>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Select Radius</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Select Polygon</Command>
+ </SubItem>
+ <SubItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Select Within</Command>
+ </SubItem>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Buffer</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Measure</Command>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>View Options</Command>
+ </MenuItem>
+ <MenuItem xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Help</Command>
+ </MenuItem>
+ <MenuItem xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>About</Command>
+ </MenuItem>
+ </ContextMenu>
+ <TaskPane>
+ <Visible>true</Visible>
+ <Width>250</Width>
+ <TaskBar>
+ <Visible>true</Visible>
+ <Home>
+ <Name>Home</Name>
+ <Tooltip>Return to home task page</Tooltip>
+ <Description>Return to home task page</Description>
+ <ImageURL>../stdicons/icon_home.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_home_disabled.gif</DisabledImageURL>
+ </Home>
+ <Forward>
+ <Name>Forward</Name>
+ <Tooltip>Forward to next task page</Tooltip>
+ <Description>Forward to next task page</Description>
+ <ImageURL>../stdicons/icon_forward.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_forward_disabled.gif</DisabledImageURL>
+ </Forward>
+ <Back>
+ <Name>Back</Name>
+ <Tooltip>Return to previous task page</Tooltip>
+ <Description>Return to previous task page</Description>
+ <ImageURL>../stdicons/icon_back.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_back_disabled.gif</DisabledImageURL>
+ </Back>
+ <Tasks>
+ <Name>Tasks</Name>
+ <Tooltip>Task list</Tooltip>
+ <Description>View a list of available tasks</Description>
+ <ImageURL>../stdicons/icon_tasks.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_tasks_disabled.gif</DisabledImageURL>
+ </Tasks>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Overview</Command>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Navigate</Command>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>FindParcels</Command>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>FindAddress</Command>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Plot</Command>
+ </MenuButton>
+ <MenuButton xsi:type="SeparatorItemType">
+ <Function>Separator</Function>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Buffer</Command>
+ </MenuButton>
+ <MenuButton xsi:type="CommandItemType">
+ <Function>Command</Function>
+ <Command>Measure</Command>
+ </MenuButton>
+ </TaskBar>
+ <InitialTask>../phpsamples/index.php</InitialTask>
+ </TaskPane>
+ <StatusBar>
+ <Visible>true</Visible>
+ </StatusBar>
+ <ZoomControl>
+ <Visible>true</Visible>
+ </ZoomControl>
+ <CommandSet>
+ <Command xsi:type="BasicCommandType">
+ <Name>Pan</Name>
+ <Label>Pan</Label>
+ <Tooltip>Pan mode</Tooltip>
+ <Description>Drag the map to view areas out of range</Description>
+ <ImageURL>../stdicons/icon_pan.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_pan_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>Pan</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Pan Up</Name>
+ <Label>Pan Up</Label>
+ <Tooltip>Pan up</Tooltip>
+ <Description>Pan up by a preset increment</Description>
+ <ImageURL>../stdicons/icon_panup.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_panup_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>PanUp</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Pan Down</Name>
+ <Label>Pan Down</Label>
+ <Tooltip>Pan down</Tooltip>
+ <Description>Pan down by a preset increment</Description>
+ <ImageURL>../stdicons/icon_pandown.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_pandown_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>PanDown</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Pan Right</Name>
+ <Label>Pan Right</Label>
+ <Tooltip>Pan right</Tooltip>
+ <Description>Pan right by a preset increment</Description>
+ <ImageURL>../stdicons/icon_panright.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_panright_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>PanRight</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Pan Left</Name>
+ <Label>Pan Left</Label>
+ <Tooltip>Pan left</Tooltip>
+ <Description>Pan left by a preset increment</Description>
+ <ImageURL>../stdicons/icon_panleft.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_panleft_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>PanLeft</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Zoom</Name>
+ <Label>Zoom</Label>
+ <Tooltip>Zoom dynamic</Tooltip>
+ <Description>Zoom dynamically by clicking and dragging</Description>
+ <ImageURL>../stdicons/icon_zoom.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoom_disabled.gif</DisabledImageURL>
+ <TargetViewer>Dwf</TargetViewer>
+ <Action>Zoom</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Zoom In</Name>
+ <Label>Zoom In</Label>
+ <Tooltip>Zoom in</Tooltip>
+ <Description>Zoom in by a preset increment</Description>
+ <ImageURL>../stdicons/icon_zoomin.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomin_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>ZoomIn</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Zoom Out</Name>
+ <Label>Zoom Out</Label>
+ <Tooltip>Zoom out</Tooltip>
+ <Description>Zoom out by a preset increment</Description>
+ <ImageURL>../stdicons/icon_zoomout.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomout_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>ZoomOut</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Zoom Rectangle</Name>
+ <Label>Zoom Rectangle</Label>
+ <Tooltip>Zoom rectangle</Tooltip>
+ <Description>Zoom in on an area</Description>
+ <ImageURL>../stdicons/icon_zoomrect.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomrect_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>ZoomRectangle</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Zoom Selection</Name>
+ <Label>Zoom Selection</Label>
+ <Tooltip>Zoom to selection</Tooltip>
+ <Description>Zoom to extents of selected features</Description>
+ <ImageURL>../stdicons/icon_zoomselect.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomselect_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>ZoomToSelection</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Initial Map View</Name>
+ <Label>Initial Map View</Label>
+ <Tooltip>Initial map view</Tooltip>
+ <Description>Fit the extents of the map to the window</Description>
+ <ImageURL>../stdicons/icon_fitwindow.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_fitwindow_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>FitToWindow</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Previous View</Name>
+ <Label>Previous View</Label>
+ <Tooltip>Previous view</Tooltip>
+ <Description>Go to previous view</Description>
+ <ImageURL>../stdicons/icon_zoomprev.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomprev_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>PreviousView</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Next View</Name>
+ <Label>Next View</Label>
+ <Tooltip>Next view</Tooltip>
+ <Description>Go to next view</Description>
+ <ImageURL>../stdicons/icon_zoomnext.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_zoomnext_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>NextView</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Initial Center and Scale</Name>
+ <Label>Initial Center and Scale</Label>
+ <Tooltip>Initial center and scale</Tooltip>
+ <Description>Zoom to initial map center and scale</Description>
+ <ImageURL>../stdicons/icon_restorecenter.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_restorecenter_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>RestoreView</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Select</Name>
+ <Label>Select</Label>
+ <Tooltip>Select mode</Tooltip>
+ <Description>Select features by clicking and dragging</Description>
+ <ImageURL>../stdicons/icon_select.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_select_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>Select</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Select Radius</Name>
+ <Label>Select Radius</Label>
+ <Tooltip>Select radius</Tooltip>
+ <Description>Click and drag to select all features inside the circle</Description>
+ <ImageURL>../stdicons/icon_selectradius.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_selectradius_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>SelectRadius</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Select Polygon</Name>
+ <Label>Select Polygon</Label>
+ <Tooltip>Select polygon</Tooltip>
+ <Description>Create a polygon to select all features that fall within</Description>
+ <ImageURL>../stdicons/icon_selectpolygon.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_selectpolygon_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>SelectPolygon</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Clear Selection</Name>
+ <Label>Clear Selection</Label>
+ <Tooltip>Clear selection</Tooltip>
+ <Description>Clear the current selections</Description>
+ <ImageURL>../stdicons/icon_clearselect.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_clearselect_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>ClearSelection</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Refresh Map</Name>
+ <Label>Refresh Map</Label>
+ <Tooltip>Refresh map</Tooltip>
+ <Description>Refresh map and reload all layers keeping current center and scale</Description>
+ <ImageURL>../stdicons/icon_refreshmap.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_refreshmap_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>Refresh</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>Copy</Name>
+ <Label>Copy</Label>
+ <Tooltip>Copy</Tooltip>
+ <Description>Copy current view of map to clipboard</Description>
+ <ImageURL>../stdicons/icon_copy.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_copy_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Action>CopyMap</Action>
+ </Command>
+ <Command xsi:type="BasicCommandType">
+ <Name>About</Name>
+ <Label>About</Label>
+ <Tooltip>About</Tooltip>
+ <Description>Display information about this application</Description>
+ <ImageURL/>
+ <DisabledImageURL/>
+ <TargetViewer>All</TargetViewer>
+ <Action>About</Action>
+ </Command>
+ <Command xsi:type="BufferCommandType">
+ <Name>Buffer</Name>
+ <Label>Buffer</Label>
+ <Tooltip>Buffer</Tooltip>
+ <Description>Create buffers around the selected features</Description>
+ <ImageURL>../stdicons/icon_buffer.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_buffer_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ </Command>
+ <Command xsi:type="SelectWithinCommandType">
+ <Name>Select Within</Name>
+ <Label>Select Within</Label>
+ <Tooltip>Select within</Tooltip>
+ <Description>Select features that fall within currently selected areas</Description>
+ <ImageURL>../stdicons/icon_selectwithin.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_selectwithin_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ </Command>
+ <Command xsi:type="PrintCommandType">
+ <Name>Print</Name>
+ <Label>Print</Label>
+ <Tooltip>Print</Tooltip>
+ <Description>Print with optional layout</Description>
+ <ImageURL>../stdicons/icon_print.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_print_disabled.gif</DisabledImageURL>
+ <TargetViewer>Dwf</TargetViewer>
+ </Command>
+ <Command xsi:type="MeasureCommandType">
+ <Name>Measure</Name>
+ <Label>Measure</Label>
+ <Tooltip>Measure</Tooltip>
+ <Description>Measure distances on the map</Description>
+ <ImageURL>../stdicons/icon_measure.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_measure_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ </Command>
+ <Command xsi:type="ViewOptionsCommandType">
+ <Name>View Options</Name>
+ <Label>View Options</Label>
+ <Tooltip>View Options</Tooltip>
+ <Description>View Options</Description>
+ <ImageURL>../stdicons/icon_viewoptions.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_viewoptions_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ </Command>
+ <Command xsi:type="GetPrintablePageCommandType">
+ <Name>Get Printable Page</Name>
+ <Label>Get Printable Page</Label>
+ <Tooltip>Get printable Page</Tooltip>
+ <Description>Get printer-friendly page</Description>
+ <ImageURL>../stdicons/icon_printablepage.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_printablepage_disabled.gif</DisabledImageURL>
+ <TargetViewer>Ajax</TargetViewer>
+ <Target>NewWindow</Target>
+ </Command>
+ <Command xsi:type="HelpCommandType">
+ <Name>Help</Name>
+ <Label>Help</Label>
+ <Tooltip>Help</Tooltip>
+ <Description>Launch help for this application</Description>
+ <ImageURL>../stdicons/icon_help.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_help_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ </Command>
+ <Command xsi:type="InvokeURLCommandType">
+ <Name>Navigate</Name>
+ <Label>Navigate</Label>
+ <Tooltip>Navigate by District</Tooltip>
+ <Description>Navigate the map by municipal district</Description>
+ <ImageURL>../stdicons/icon_invokeurl.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_invokeurl_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ <URL>../phpviewersample/navigatetask.php</URL>
+ <LayerSet/>
+ <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+ </Command>
+ <Command xsi:type="InvokeURLCommandType">
+ <Name>Overview</Name>
+ <Label>Overview</Label>
+ <Tooltip>Display an Overview</Tooltip>
+ <Description>Display an overview of the application</Description>
+ <ImageURL>../stdicons/icon_invokeurl.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_invokeurl_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ <URL>../phpviewersample/overviewtask.php</URL>
+ <LayerSet/>
+ <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+ </Command>
+ <Command xsi:type="InvokeURLCommandType">
+ <Name>FindParcels</Name>
+ <Label>Find Parcels</Label>
+ <Tooltip>Find Parcel By Owner</Tooltip>
+ <Description>Find parcels by owner</Description>
+ <ImageURL>../stdicons/icon_invokeurl.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_invokeurl_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ <URL>../phpviewersample/findparceltask.php</URL>
+ <LayerSet/>
+ <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+ </Command>
+ <Command xsi:type="InvokeURLCommandType">
+ <Name>Plot</Name>
+ <Label>Plot as DWF</Label>
+ <Tooltip>Plot as DWF</Tooltip>
+ <Description>Plot the current map as a DWF</Description>
+ <ImageURL>../stdicons/icon_invokeurl.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_invokeurl_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ <URL>../phpviewersample/plottask.php</URL>
+ <LayerSet/>
+ <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+ </Command>
+ <Command xsi:type="InvokeURLCommandType">
+ <Name>FindAddress</Name>
+ <Label>Find Address</Label>
+ <Tooltip>Find an Address</Tooltip>
+ <Description>Find an address in Sheboygan</Description>
+ <ImageURL>../stdicons/icon_invokeurl.gif</ImageURL>
+ <DisabledImageURL>../stdicons/icon_invokeurl_disabled.gif</DisabledImageURL>
+ <TargetViewer>All</TargetViewer>
+ <Target>TaskPane</Target>
+ <URL>../phpviewersample/findaddresstask.php</URL>
+ <LayerSet/>
+ <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+ </Command>
+ </CommandSet>
+</WebLayout>
\ No newline at end of file
Modified: trunk/MgDev/Doc/samples/phpsamples/main.php
===================================================================
--- trunk/MgDev/Doc/samples/phpsamples/main.php 2012-06-18 13:13:01 UTC (rev 6783)
+++ trunk/MgDev/Doc/samples/phpsamples/main.php 2012-06-18 13:31:48 UTC (rev 6784)
@@ -37,10 +37,30 @@
try
{
$sessionId = $site->CreateSession();
+ $siteConn = new MgSiteConnection();
+ $siteConn->Open($userInfo);
// Define some constants
$webLayout = "Library://Samples/Layouts/PHPSamples.WebLayout";
$title = "MapGuide Developer's Guide PHP Samples";
+
+ // We check for the existence of the specified WebLayout
+ //
+ // If it doesn't exist, we load a copy from the WebLayout.xml on disk. This is a basic example
+ // of programmatically loading resource content into to the repository.
+ $wlResId = new MgResourceIdentifier($webLayout);
+ $resSvc = $siteConn->CreateService(MgServiceType::ResourceService);
+ if (!$resSvc->ResourceExists($wlResId)) {
+ $wlPath = dirname(__FILE__)."//WebLayout.xml";
+ $wlByteSource = new MgByteSource($wlPath);
+ $wlByteReader = $wlByteSource->GetReader();
+ // NOTE: The Author account generally has write access into the site repository
+ // which is why we're doing it like this.
+ // If this was an Anonymous user, they can't write into the session repository. We would normally
+ // load our content into a session-based repository and modify $webLayout to point to our
+ // session loaded resource
+ $resSvc->SetResource($wlResId, $wlByteReader, null);
+ }
}
catch (MgException $e)
{
Modified: trunk/MgDev/Doc/samples/phpsamples/readme.txt
===================================================================
--- trunk/MgDev/Doc/samples/phpsamples/readme.txt 2012-06-18 13:13:01 UTC (rev 6783)
+++ trunk/MgDev/Doc/samples/phpsamples/readme.txt 2012-06-18 13:31:48 UTC (rev 6784)
@@ -13,4 +13,4 @@
These samples require a user named "Author" (pass: author) with authoring privileges. This is a default user in a standard MapGuide installation. If you have deleted or modified this user, edit main.php and update with a matching login
-These samples require the Sheboygan sample dataset. In addition it requires a web layout that is provided in the PHPSamples.mgp. Load this package first before running the samples.
\ No newline at end of file
+These samples require the Sheboygan sample dataset. Load this package first before running the samples.
\ No newline at end of file
Property changes on: trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6738-6741,6749-6756
/sandbox/adsk/2.4j/Server/src/Services/Feature/ServerFeatureUtil.cpp:6327-6481
/sandbox/rfc94/Server/src/Services/Feature/ServerFeatureUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6250-6326
+ /branches/2.4/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6738-6741,6749-6756,6777-6783
/sandbox/adsk/2.4j/Server/src/Services/Feature/ServerFeatureUtil.cpp:6327-6481
/sandbox/rfc94/Server/src/Services/Feature/ServerFeatureUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6250-6326
Property changes on: trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6738-6741,6749-6756
/sandbox/adsk/2.4j/Server/src/Services/Mapping/MappingUtil.cpp:6327-6535
/sandbox/rfc94/Server/src/Services/Mapping/MappingUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6250-6326
+ /branches/2.4/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6738-6741,6749-6756,6777-6783
/sandbox/adsk/2.4j/Server/src/Services/Mapping/MappingUtil.cpp:6327-6535
/sandbox/rfc94/Server/src/Services/Mapping/MappingUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6250-6326
Property changes on: trunk/MgDev/Web/src/mapadmin/HelpDocs
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Web/src/mapadmin/HelpDocs:6738-6741,6749-6756
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs:6413
/sandbox/rfc94/Web/src/mapadmin/HelpDocs:5099-5163
+ /branches/2.4/MgDev/Web/src/mapadmin/HelpDocs:6738-6741,6749-6756,6777-6783
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs:6413
/sandbox/rfc94/Web/src/mapadmin/HelpDocs:5099-5163
Property changes on: trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6738-6741,6749-6756
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6327-6435
/sandbox/rfc94/Web/src/mapadmin/HelpDocs/configuring_servers.htm:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6250-6326
+ /branches/2.4/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6738-6741,6749-6756,6777-6783
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6327-6435
/sandbox/rfc94/Web/src/mapadmin/HelpDocs/configuring_servers.htm:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6250-6326
Modified: trunk/MgDev/Web/src/mapviewerjava/getselectedfeatures.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/getselectedfeatures.jsp 2012-06-18 13:13:01 UTC (rev 6783)
+++ trunk/MgDev/Web/src/mapviewerjava/getselectedfeatures.jsp 2012-06-18 13:31:48 UTC (rev 6784)
@@ -171,6 +171,7 @@
break;
case MgPropertyType.String:
value = JsonEscape(reader.GetString(propName)); // string content is arbitrary
+ value = value.replaceAll("\\s+", " ").trim();
break;
default: //NOT PRESENTABLE IN PROPERTY GRID
value = "";
Modified: trunk/MgDev/Web/src/mapviewernet/getselectedfeatures.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/getselectedfeatures.aspx 2012-06-18 13:13:01 UTC (rev 6783)
+++ trunk/MgDev/Web/src/mapviewernet/getselectedfeatures.aspx 2012-06-18 13:31:48 UTC (rev 6784)
@@ -83,6 +83,7 @@
String sessionId;
String locale;
CultureInfo culture;
+ System.Text.RegularExpressions.Regex regex;
static NameValueCollection GetLayerPropertyMappings(MgResourceService resSvc, MgLayerBase layer)
{
@@ -132,6 +133,7 @@
break;
case MgPropertyType.String:
value = JsonEscape(reader.GetString(propName)); //String content is arbitrary
+ value = regex.Replace(value, " ").Trim();
break;
default: //NOT PRESENTABLE IN PROPERTY GRID
value = "";
@@ -260,6 +262,7 @@
locale = GetDefaultLocale();
culture = CultureInfo.GetCultureInfo(locale);
+ regex = new System.Text.RegularExpressions.Regex("\\s+");
//HACK: The default locale (en) resolves to a neutral culture, .net forbids the use of
//neutral cultures for formatting purposes, so default to InvariantCulture if the resolved
Modified: trunk/MgDev/Web/src/mapviewerphp/getselectedfeatures.php
===================================================================
--- trunk/MgDev/Web/src/mapviewerphp/getselectedfeatures.php 2012-06-18 13:13:01 UTC (rev 6783)
+++ trunk/MgDev/Web/src/mapviewerphp/getselectedfeatures.php 2012-06-18 13:31:48 UTC (rev 6784)
@@ -391,6 +391,7 @@
case MgPropertyType::String:
$tStr = "String";
$val = JsonEscape($fr->GetString($propName)); //String content is arbitrary
+ $val = trim(preg_replace('/\s+/',' ',$val));
break;
case MgPropertyType::Blob: //NOT PRESENTABLE IN PROPERTY GRID
$tStr = "BLOB";
Property changes on: trunk/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:6738-6741,6749-6756
/sandbox/adsk/2.4jbeta2/Web/src/mapviewerphp/quickplotgeneratepicture.php:6334-6374
/sandbox/rfc94/Web/src/mapviewerphp/quickplotgeneratepicture.php:5099-5163
+ /branches/2.4/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:6738-6741,6749-6756,6777-6783
/sandbox/adsk/2.4jbeta2/Web/src/mapviewerphp/quickplotgeneratepicture.php:6334-6374
/sandbox/rfc94/Web/src/mapviewerphp/quickplotgeneratepicture.php:5099-5163
Property changes on: trunk/MgDev/Web/src/viewerfiles
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Web/src/viewerfiles:6738-6741,6749-6756
/sandbox/adsk/2.2gp/Web/src/viewerfiles:5392
+ /branches/2.4/MgDev/Web/src/viewerfiles:6738-6741,6749-6756,6777-6783
/sandbox/adsk/2.2gp/Web/src/viewerfiles:5392
Property changes on: trunk/MgDev/Web/src/viewerfiles/quickplot.js
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Web/src/viewerfiles/quickplot.js:6738-6741,6749-6756
/sandbox/adsk/2.2gp/Web/src/viewerfiles/quickplot.js:5392
/sandbox/adsk/2.4j/Web/src/viewerfiles/quickplot.js:6327-6474
/trunk/MgDev/Web/src/viewerfiles/quickplot.js:6250-6326
+ /branches/2.4/MgDev/Web/src/viewerfiles/quickplot.js:6738-6741,6749-6756,6777-6783
/sandbox/adsk/2.2gp/Web/src/viewerfiles/quickplot.js:5392
/sandbox/adsk/2.4j/Web/src/viewerfiles/quickplot.js:6327-6474
/trunk/MgDev/Web/src/viewerfiles/quickplot.js:6250-6326
More information about the mapguide-commits
mailing list