Compare commits
2 Commits
7442e4ee09
...
0a5c5dfd7d
| Author | SHA1 | Date | |
|---|---|---|---|
| 0a5c5dfd7d | |||
| d8d35c3462 |
@@ -265,7 +265,7 @@ public class LayerDto {
|
|||||||
private JsonNode rawJson;
|
private JsonNode rawJson;
|
||||||
|
|
||||||
@Schema(description = "crs")
|
@Schema(description = "crs")
|
||||||
private Integer crs;
|
private String crs;
|
||||||
|
|
||||||
public LayerMapDto(
|
public LayerMapDto(
|
||||||
String layerType,
|
String layerType,
|
||||||
@@ -281,7 +281,7 @@ public class LayerDto {
|
|||||||
String bboxGeometry,
|
String bboxGeometry,
|
||||||
UUID uuid,
|
UUID uuid,
|
||||||
String rawJsonString,
|
String rawJsonString,
|
||||||
Integer crs) {
|
String crs) {
|
||||||
this.layerType = layerType;
|
this.layerType = layerType;
|
||||||
this.tag = tag;
|
this.tag = tag;
|
||||||
this.sortOrder = sortOrder;
|
this.sortOrder = sortOrder;
|
||||||
@@ -364,7 +364,7 @@ public class LayerDto {
|
|||||||
|
|
||||||
@JsonIgnore private String bboxGeometry;
|
@JsonIgnore private String bboxGeometry;
|
||||||
|
|
||||||
private Integer crs;
|
private String crs;
|
||||||
|
|
||||||
public TileUrlDto(
|
public TileUrlDto(
|
||||||
Integer mngYyyy,
|
Integer mngYyyy,
|
||||||
@@ -377,7 +377,7 @@ public class LayerDto {
|
|||||||
Short minZoom,
|
Short minZoom,
|
||||||
Short maxZoom,
|
Short maxZoom,
|
||||||
String bboxGeometry,
|
String bboxGeometry,
|
||||||
Integer crs) {
|
String crs) {
|
||||||
this.mngYyyy = mngYyyy;
|
this.mngYyyy = mngYyyy;
|
||||||
this.url = url;
|
this.url = url;
|
||||||
this.tag = tag;
|
this.tag = tag;
|
||||||
|
|||||||
@@ -120,7 +120,7 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
|
|||||||
crsInt),
|
crsInt),
|
||||||
mapLayerEntity.uuid,
|
mapLayerEntity.uuid,
|
||||||
Expressions.stringTemplate("cast({0} as text)", mapLayerEntity.rawJson),
|
Expressions.stringTemplate("cast({0} as text)", mapLayerEntity.rawJson),
|
||||||
crsInt))
|
mapLayerEntity.crs))
|
||||||
.from(mapLayerEntity)
|
.from(mapLayerEntity)
|
||||||
.where(layerTypeCondition(type), mapLayerEntity.isDeleted.isFalse())
|
.where(layerTypeCondition(type), mapLayerEntity.isDeleted.isFalse())
|
||||||
.orderBy(mapLayerEntity.order.asc())
|
.orderBy(mapLayerEntity.order.asc())
|
||||||
@@ -154,7 +154,7 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
|
|||||||
mapSheetMngTileEntity.maxLon,
|
mapSheetMngTileEntity.maxLon,
|
||||||
mapSheetMngTileEntity.maxLat,
|
mapSheetMngTileEntity.maxLat,
|
||||||
crsInt),
|
crsInt),
|
||||||
crsInt))
|
mapSheetMngTileEntity.crs))
|
||||||
.from(mapSheetMngTileEntity)
|
.from(mapSheetMngTileEntity)
|
||||||
.where(mapSheetMngTileEntity.mngYyyy.eq(beforeYear))
|
.where(mapSheetMngTileEntity.mngYyyy.eq(beforeYear))
|
||||||
.fetchOne();
|
.fetchOne();
|
||||||
@@ -180,7 +180,7 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
|
|||||||
mapSheetMngTileEntity.maxLon,
|
mapSheetMngTileEntity.maxLon,
|
||||||
mapSheetMngTileEntity.maxLat,
|
mapSheetMngTileEntity.maxLat,
|
||||||
crsInt),
|
crsInt),
|
||||||
crsInt))
|
mapSheetMngTileEntity.crs))
|
||||||
.from(mapSheetMngTileEntity)
|
.from(mapSheetMngTileEntity)
|
||||||
.where(mapSheetMngTileEntity.mngYyyy.eq(afterYear))
|
.where(mapSheetMngTileEntity.mngYyyy.eq(afterYear))
|
||||||
.fetchOne();
|
.fetchOne();
|
||||||
@@ -214,7 +214,7 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
|
|||||||
mapSheetMngTileEntity.maxLon,
|
mapSheetMngTileEntity.maxLon,
|
||||||
mapSheetMngTileEntity.maxLat,
|
mapSheetMngTileEntity.maxLat,
|
||||||
crsInt),
|
crsInt),
|
||||||
crsInt))
|
mapSheetMngTileEntity.crs))
|
||||||
.from(mapSheetMngTileEntity)
|
.from(mapSheetMngTileEntity)
|
||||||
.where(mapSheetMngTileEntity.mngYyyy.eq(year))
|
.where(mapSheetMngTileEntity.mngYyyy.eq(year))
|
||||||
.fetchOne();
|
.fetchOne();
|
||||||
|
|||||||
Reference in New Issue
Block a user