From: user <prashantgosai11@gmail.com>
Date: Thu, 07 Jan 2021 16:40:42 +0530
Subject: hello
---
hello
---


--- 'a/src/main/java/com/GisSatellite/Server/Controller/ApiController.java'
+++ b/src/main/java/com/GisSatellite/Server/Controller/ApiController.java
@@ -15,15 +15,22 @@ import org.springframework.http.HttpStat
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.MimeTypeUtils;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.GisSatellite.Server.Entities.FilterData;
 import com.GisSatellite.Server.Entities.Satellite;
+import com.GisSatellite.Server.Entities.Taluka;
 import com.GisSatellite.Server.Repository.SatelliteRepository;
+import com.GisSatellite.Server.Repository.TalukaRepository;
+
 
 
 
@@ -35,6 +42,9 @@ public class ApiController {
 	@Autowired
 	private SatelliteRepository satelliteRepository;
 	
+	@Autowired
+	private TalukaRepository talukaRepo;
+	
 	/*
 	 * @RequestMapping(value = "getData", method = RequestMethod.POST) public
 	 * List<Satellite> getData(@RequestBody FilterData filterData ) {
@@ -156,5 +166,26 @@ public class ApiController {
 		return satelliteRepository.getDummyData(1818 ,"");
 		
 	}
+	@PostMapping("/gettaluka/{name}")
+	public List<Taluka> getTalukaByName(@PathVariable("name") String name){
+		//System.out.println("in gettaluka");
+		//System.out.println(talukaRepo.findByTalukanameContainingIgnoreCase(name));
+		return talukaRepo.findByTalukanameContainingIgnoreCase(name);
+	}
+	
+	
+	@RequestMapping(value = "intersectbygeom/{id}", method = RequestMethod.POST)
+	List<Satellite> getIntersectGeom(@PathVariable("id")Integer id) {
+
+		/*
+		 * System.out.println(taluka.getGid());
+		 * System.out.println(talukaRepo.intersectByGeom(id);
+		 */
+		
+		System.out.println("test geom"+satelliteRepository.intersectByGeom(id));
+		return satelliteRepository.intersectByGeom(id);
+	}
+	
+	
 	
 }

--- 'a/src/main/java/com/GisSatellite/Server/Controller/SatelliteController.java'
+++ b/src/main/java/com/GisSatellite/Server/Controller/SatelliteController.java
@@ -163,8 +163,8 @@ public class SatelliteController {
 					 }
 						
 					 System.out.println(map);
-					 System.out.println(map.get("DPCounter"));
-					 System.out.println(map.size());
+//					 System.out.println(map.get("DPCounter"));
+//					 System.out.println(map.size());
 					 myReader.close(); 
 					   model.addAttribute("filedata", map);
 				 return "satelliteform";

--- 'a/src/main/java/com/GisSatellite/Server/Repository/SatelliteRepository.java'
+++ b/src/main/java/com/GisSatellite/Server/Repository/SatelliteRepository.java
@@ -9,6 +9,7 @@ import org.springframework.data.reposito
 
 import com.GisSatellite.Server.Entities.FilterData;
 import com.GisSatellite.Server.Entities.Satellite;
+import com.GisSatellite.Server.Entities.Taluka;
 
 
 
@@ -60,7 +61,8 @@ public interface SatelliteRepository ext
 
 
 
-
+	@Query(value = "SELECT a.* FROM   satellite_data_5  as a,  subdistrict2011_bound as b  where b.gid =:id and ST_Intersects(a.addgeom, b.geom)='t' ",nativeQuery = true)
+	List<Satellite> intersectByGeom( int id);
 
 	
 

--- 'a/src/main/webapp/views/attribute.jsp'
+++ b/src/main/webapp/views/attribute.jsp
@@ -249,17 +249,20 @@ tfoot input {
       
     
       </div>
-   
-     <input style ="display:none;margin-top:10px;margin-left:80px;width:150px" id="cityname" type="text"   placeholder="city name" >
+  
+     
+
+</form>
+<input style ="display:none;margin-top:10px;margin-left:80px;width:150px" id="cityname" type="text" name="gid"  placeholder="city name" >
+     <div id="search-result"></div>
+     <div class="clear"></div>
 	
 	 <div class="modal-footer">
-	    <button class="btn btn-warning">Filter</button>
+	    <button  id="cityfilter" class="btn btn-warning" onclick="onclicktaluka()">Filter</button>
 	  <button id="reset"  name="reset" onclick="resetForm1()" class="btn btn-warning">Reset</button>
         
       </div>
 
-</form>
-
 </div>
 
 </div>
@@ -951,4 +954,6 @@ var   layerselected=[];
 <script src="customol/js/services/services.js"></script>
 <script src="customol/js/Base64.js"></script>
 <script src="customol/js/geomForm.js"></script>
+<script src="mis/js/services/misservices.js"></script>
+<script src="mis/js/customscripts/search.js"></script>
 </html>

--- 'a/src/main/webapp/views/satelliteform.jsp'
+++ b/src/main/webapp/views/satelliteform.jsp
@@ -112,14 +112,14 @@
 	<div class="container-contact100" style="background-color: #586266">
 		<div class="wrap-contact100 ">
 
-
+	<span class="contact100-form-title"> Satellite Form </span>
 			<form class="contact100-form " action="/uploadFile" method="post"
 				enctype="multipart/form-data">
 
 
 				<div class="wrap-input100 rs1-wrap-input100">
 
-					<span class="label-input100">Satellite Image :</span><br>
+					<span class="label-input100">Satellite File :</span><br>
 					<br> <input type="file" id="image1" path="image1"
 						name="textFile" class="label-input100">
 				</div>
@@ -127,7 +127,7 @@
 				<div class="container-contact100-form-btn">
 					<div class="wrap-contact100-form-btn">
 						<div class="contact100-form-bgbtn"></div>
-						<button class="contact100-form-btn" type="submit">UploadFile
+						<button class="contact100-form-btn" type="submit">Fill Details
 						</button>
 					</div>
 				</div>
@@ -137,7 +137,9 @@
 			<form class="contact100-form " action="/success" method="post"
 				enctype="multipart/form-data">
 
-				<span class="contact100-form-title"> Satellite Form </span>
+			
+				
+				
 
 				<div class="wrap-input100 rs1-wrap-input100 validate-input">
 
@@ -194,7 +196,7 @@
 				</div>
 				<div class="wrap-input100 rs1-wrap-input100 validate-input">
 					<span class="label-input100">Date :</span> <input class="input100"
-						type="date" id="date" name="date" required>
+						type="date" id="date" name="date" required value="${filedata.DateOfPass} ">
 				</div>
 
 				<div class="wrap-input100 rs1-wrap-input100 validate-input">