@@ -95,26 +95,20 @@ public CompanySiteDto mapToDto(CompanySite companySite) {
95
95
return dto ;
96
96
}
97
97
98
- public CompanySiteDto mapToDtoNew (CompanySite companySite ) {
99
- var dto = new CompanySiteDto (companySite .getId (), companySite .getTitle (), companySite .getAtDate (),
100
- new ArrayList <PolygonDto >());
101
- return dto ;
102
- }
103
-
104
- public PolygonDto mapToDtoNew (Polygon polygon , CompanySiteDto companySiteDto ) {
98
+ public PolygonDto mapToDto (Polygon polygon , CompanySiteDto companySiteDto ) {
105
99
PolygonDto dto = new PolygonDto (polygon .getId (), polygon .getFillColor (), polygon .getBorderColor (),
106
100
polygon .getTitle (), polygon .getLongitude (), polygon .getLatitude (), new ArrayList <RingDto >());
107
101
companySiteDto .getPolygons ().add (dto );
108
102
return dto ;
109
103
}
110
104
111
- public RingDto mapToDtoNew (Ring ring , PolygonDto polygonDto ) {
105
+ public RingDto mapToDto (Ring ring , PolygonDto polygonDto ) {
112
106
var dto = new RingDto (ring .getId (), ring .isPrimaryRing (), new ArrayList <LocationDto >());
113
107
polygonDto .getRings ().add (dto );
114
108
return dto ;
115
109
}
116
110
117
- public LocationDto mapToDtoNew (Location location , RingDto ringDto ) {
111
+ public LocationDto mapToDto (Location location , RingDto ringDto ) {
118
112
var dto = new LocationDto (location .getId (), location .getLongitude (), location .getLatitude (), location .getOrderId ());
119
113
ringDto .getLocations ().add (dto );
120
114
return dto ;
0 commit comments