Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit ca3cbea

Browse filesBrowse files
PondiBPondiB
committed
⏰ Refactor and setting up health controllers, geometries commented out
1 parent e63351a commit ca3cbea
Copy full SHA for ca3cbea
Expand file treeCollapse file tree

10 files changed

+65
-19
lines changed

‎pom.xml

Copy file name to clipboardExpand all lines: pom.xml
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,13 @@
9797
<artifactId>slf4j-api</artifactId>
9898
<version>1.7.30</version>
9999
</dependency>
100+
<!-- https://mvnrepository.com/artifact/com.graphhopper.external/jackson-datatype-jts -->
101+
<dependency>
102+
<groupId>com.graphhopper.external</groupId>
103+
<artifactId>jackson-datatype-jts</artifactId>
104+
<version>0.10-2.5-2</version>
105+
</dependency>
106+
100107

101108

102109
</dependencies>

‎src/main/java/com/brianpondi/gis/controller/NairobiHealthFacilityController.java

Copy file name to clipboard
+36Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package com.brianpondi.gis.controller;
2+
3+
import com.brianpondi.gis.entity.NairobiHealthFacility;
4+
import com.brianpondi.gis.service.NairobiHealthFacilityService;
5+
import javassist.NotFoundException;
6+
import org.springframework.beans.factory.annotation.Autowired;
7+
import org.springframework.web.bind.annotation.GetMapping;
8+
import org.springframework.web.bind.annotation.PathVariable;
9+
import org.springframework.web.bind.annotation.RequestMapping;
10+
import org.springframework.web.bind.annotation.RestController;
11+
12+
import java.util.List;
13+
14+
@RestController
15+
@RequestMapping("/api/nairobihealthfacilities")
16+
public class NairobiHealthFacilityController {
17+
18+
@Autowired
19+
private NairobiHealthFacilityService nairobiHealthFacilityService;
20+
21+
@GetMapping
22+
public List<NairobiHealthFacility> findAll() {
23+
return nairobiHealthFacilityService.findAll();
24+
}
25+
26+
@GetMapping(path = "/{id}")
27+
public NairobiHealthFacility findById(@PathVariable("id") int id) {
28+
try {
29+
return nairobiHealthFacilityService.findById(id);
30+
} catch (NotFoundException e) {
31+
e.printStackTrace();
32+
}
33+
return null;
34+
}
35+
36+
}

‎src/main/java/com/brianpondi/gis/controller/NairobiSubCountyController.java

Copy file name to clipboardExpand all lines: src/main/java/com/brianpondi/gis/controller/NairobiSubCountyController.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111

1212
@RestController
13-
@RequestMapping("/api/nairobisubcounty")
13+
@RequestMapping("/api/nairobisubcounties")
1414
public class NairobiSubCountyController {
1515

1616
@Autowired
17-
NairobiSubCountyService nairobiSubCountyService;
17+
private NairobiSubCountyService nairobiSubCountyService;
1818

1919
@GetMapping
2020
public List<NairobiSubCounty> findAll() {

‎src/main/java/com/brianpondi/gis/entity/NairobiHealthFacility.java

Copy file name to clipboardExpand all lines: src/main/java/com/brianpondi/gis/entity/NairobiHealthFacility.java
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.brianpondi.gis.entity;
22

3-
import com.vividsolutions.jts.geom.Geometry;
43
import lombok.Getter;
54
import lombok.Setter;
65

@@ -18,7 +17,7 @@ public class NairobiHealthFacility implements Serializable {
1817
@Id
1918
@GeneratedValue
2019
private Integer id;
21-
private Geometry geom;
20+
// private Point geom;
2221
private String name;
2322
private String contact;
2423

‎src/main/java/com/brianpondi/gis/entity/NairobiSubCounty.java

Copy file name to clipboardExpand all lines: src/main/java/com/brianpondi/gis/entity/NairobiSubCounty.java
+2-4Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package com.brianpondi.gis.entity;
22

3-
import com.vividsolutions.jts.geom.Geometry;
43
import lombok.Getter;
54
import lombok.Setter;
6-
import org.springframework.data.annotation.Transient;
75

86
import javax.persistence.Entity;
97
import javax.persistence.GeneratedValue;
@@ -20,8 +18,8 @@ public class NairobiSubCounty implements Serializable {
2018
@Id
2119
@GeneratedValue
2220
private Integer id;
23-
@Transient
24-
private Geometry geom;
21+
// private MultiPolygon geom;
2522
private String name;
2623

24+
2725
}

‎src/main/java/com/brianpondi/gis/service/NairobiHealthFacilityServiceImp.java renamed to ‎src/main/java/com/brianpondi/gis/service/Impl/NairobiHealthFacilityServiceImp.java

Copy file name to clipboardExpand all lines: src/main/java/com/brianpondi/gis/service/Impl/NairobiHealthFacilityServiceImp.java
+8-3Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
1-
package com.brianpondi.gis.service;
1+
package com.brianpondi.gis.service.Impl;
22

33
import com.brianpondi.gis.entity.NairobiHealthFacility;
44
import com.brianpondi.gis.repository.NairobiHealthFacilityRepository;
5+
import com.brianpondi.gis.service.NairobiHealthFacilityService;
56
import com.vividsolutions.jts.geom.Geometry;
67
import com.vividsolutions.jts.geom.GeometryFactory;
78
import com.vividsolutions.jts.io.ParseException;
89
import com.vividsolutions.jts.io.WKTReader;
910
import javassist.NotFoundException;
1011
import org.springframework.beans.factory.annotation.Autowired;
12+
import org.springframework.stereotype.Service;
1113

1214
import java.util.List;
1315

16+
@Service
1417
public class NairobiHealthFacilityServiceImp implements NairobiHealthFacilityService {
1518

19+
@Autowired
20+
private NairobiHealthFacilityRepository nairobiHealthFacilityRepository;
21+
1622
private static GeometryFactory geometryFactory = new GeometryFactory();
1723
private static WKTReader wktReader = new WKTReader(geometryFactory);
1824

19-
@Autowired
20-
NairobiHealthFacilityRepository nairobiHealthFacilityRepository;
25+
2126

2227
private static Geometry fromWkt(String wkt) {
2328
try {

‎src/main/java/com/brianpondi/gis/service/NairobiSubCountyServiceImp.java renamed to ‎src/main/java/com/brianpondi/gis/service/Impl/NairobiSubCountyServiceImp.java

Copy file name to clipboardExpand all lines: src/main/java/com/brianpondi/gis/service/Impl/NairobiSubCountyServiceImp.java
+6-3Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
package com.brianpondi.gis.service;
1+
package com.brianpondi.gis.service.Impl;
22

33
import com.brianpondi.gis.entity.NairobiSubCounty;
44
import com.brianpondi.gis.repository.NairobiSubCountyRepository;
5+
import com.brianpondi.gis.service.NairobiSubCountyService;
56
import com.vividsolutions.jts.geom.Geometry;
67
import com.vividsolutions.jts.geom.GeometryFactory;
78
import com.vividsolutions.jts.io.ParseException;
@@ -19,11 +20,13 @@
1920
@Service
2021
public class NairobiSubCountyServiceImp implements NairobiSubCountyService {
2122

23+
@Autowired
24+
NairobiSubCountyRepository nairobiSubCountyRepository;
25+
2226
private static GeometryFactory geometryFactory = new GeometryFactory();
2327
private static WKTReader wktReader = new WKTReader(geometryFactory);
2428

25-
@Autowired
26-
NairobiSubCountyRepository nairobiSubCountyRepository;
29+
2730

2831
private static Geometry fromWkt(String wkt) {
2932
try {

‎src/main/java/com/brianpondi/gis/service/NairobiHealthFacilityService.java

Copy file name to clipboardExpand all lines: src/main/java/com/brianpondi/gis/service/NairobiHealthFacilityService.java
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import com.brianpondi.gis.entity.NairobiHealthFacility;
44
import javassist.NotFoundException;
5-
import org.springframework.stereotype.Service;
65

76
import java.util.List;
87

9-
@Service
8+
109
public interface NairobiHealthFacilityService {
1110
List<NairobiHealthFacility> findAll();
1211
NairobiHealthFacility findById(int id) throws NotFoundException;

‎src/main/java/com/brianpondi/gis/service/NairobiSubCountyService.java

Copy file name to clipboardExpand all lines: src/main/java/com/brianpondi/gis/service/NairobiSubCountyService.java
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import com.brianpondi.gis.entity.NairobiSubCounty;
44
import javassist.NotFoundException;
5-
import org.springframework.stereotype.Service;
65

76
import java.util.List;
87

9-
@Service
8+
109
public interface NairobiSubCountyService {
1110
List<NairobiSubCounty> findAll();
1211
NairobiSubCounty findById(int id) throws NotFoundException;

‎src/main/resources/application.properties

Copy file name to clipboardExpand all lines: src/main/resources/application.properties
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
spring.datasource.url=jdbc:postgresql://localhost:5432/nairobigis
44
spring.datasource.username=postgres
55
spring.datasource.password=123456
6-
spring.jpa.properties.hibernate.dialect=org.hibernate.spatial.dialect.postgis.PostgisDialect
6+
spring.jpa.database-platform=org.hibernate.spatial.dialect.postgis.PostgisDialect
77
spring.jpa.hibernate.ddl-auto=update
88
server.port= 8081

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.