Преглед изворни кода

Merge branch 'DEV' of http://10.1.1.202:3030/steve07s/DataBase into DEV

nate пре 3 година
родитељ
комит
b955a4bf33
1 измењених фајлова са 58 додато и 9 уклоњено
  1. 58 9
      index.php

+ 58 - 9
index.php

@@ -260,6 +260,7 @@ if (!isset($_SESSION['loggedin'])) {
 			"esri/webscene/Slide",
 			"esri/symbols/WebStyleSymbol",
 			"esri/widgets/DirectLineMeasurement3D",
+			"esri/widgets/AreaMeasurement3D",
 			"esri/Graphic",
 			"esri/widgets/Search/LocatorSearchSource",
 			"esri/renderers/UniqueValueRenderer",
@@ -291,6 +292,7 @@ if (!isset($_SESSION['loggedin'])) {
 			Slide,
 			WebStyleSymbol,
 			DirectLineMeasurement3D,
+			AreaMeasurement3D,
 			Graphic,
 			LocatorSearchSource,
 			UniqueValueRenderer,
@@ -352,6 +354,7 @@ if (!isset($_SESSION['loggedin'])) {
 
 
 
+
 			view.ui.add(
 				new Expand({
 					view: view,
@@ -372,14 +375,7 @@ if (!isset($_SESSION['loggedin'])) {
 				"top-left"
 			);
 
-			view.ui.add(
-				new Fullscreen({
-					view: view,
-					group: "top-left"
-				}),
-				"top-left"
-			);
-
+			//新增量測工具
 			var activeMeasureWidget = new DirectLineMeasurement3D({
 				view: view
 			});
@@ -391,10 +387,62 @@ if (!isset($_SESSION['loggedin'])) {
 				group: "top-left"
 			});
 
+			var activeMeasureWidget2 = new AreaMeasurement3D({
+				view: view
+			});
+
+			var pMeasureExpand2 = new Expand({
+				view: view,
+				container: document.getElementById("measureExpendDiv2"),
+				content: activeMeasureWidget2,
+				group: "top-left"
+			});
+
+			view.ui.add([pMeasureExpand, pMeasureExpand2], "top-left");
+
+
+			/*
+			var activeMeasureWidget = new DirectLineMeasurement3D({
+				container: document.getElementById("measureExpendDiv"),
+				view: view
+			});
+
+			var pMeasureExpand = new Expand({
+				view: view,
+				content: activeMeasureWidget,
+				group: "top-left"
+			});
+
 			view.ui.add(
 				pMeasureExpand,
 				"top-left"
+			);*/
+			view.ui.add(
+				new Fullscreen({
+					view: view,
+					group: "top-left"
+				}),
+				"top-right"
+			);
+			view.ui.add(
+				new Zoom({
+					view: view
+				}),
+				"top-right"
 			);
+			view.ui.add(
+				new NavigationToggle({
+					view: view
+				}),
+				"top-right"
+			);
+			view.ui.add(
+				new Compass({
+					view: view
+				}),
+				"top-right"
+			);
+
 
 			$("#measureExpendDiv .esri-widget--button").click(function() {
 				if (pMeasureExpand.expanded) {
@@ -408,7 +456,7 @@ if (!isset($_SESSION['loggedin'])) {
 				return layer.queryExtent().then((response) => {
 					view.goTo({
 						target: response.extent,
-						tilt: 55,
+						tilt: 0,
 						heading: 0,
 					}).catch((error) => {
 						console.error(error);
@@ -584,6 +632,7 @@ if (!isset($_SESSION['loggedin'])) {
 								<div class="mapok" style="height:100%">
 									<div id="viewDiv"></div>
 									<div id="measureExpendDiv"></div>
+									<div id="measureExpendDiv2"></div>
 									<div id="slidesDiv" class="esri-widget"></div>
 									<span style="display:none;" id="project-id"></span>
 								</div>