Skip to content
Snippets Groups Projects
Commit 0cde5f90 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

project object contains info about map canvas implementation

parent 8bdf8674
No related branches found
No related tags found
1 merge request!295Resolve "alternative to google maps api way of visualizing maps"
...@@ -2,6 +2,7 @@ package lcsb.mapviewer.model; ...@@ -2,6 +2,7 @@ package lcsb.mapviewer.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
...@@ -31,6 +32,7 @@ import org.hibernate.annotations.LazyCollectionOption; ...@@ -31,6 +32,7 @@ import org.hibernate.annotations.LazyCollectionOption;
import lcsb.mapviewer.common.EventStorageLoggerAppender; import lcsb.mapviewer.common.EventStorageLoggerAppender;
import lcsb.mapviewer.common.exception.InvalidArgumentException; import lcsb.mapviewer.common.exception.InvalidArgumentException;
import lcsb.mapviewer.model.cache.UploadedFileEntry; import lcsb.mapviewer.model.cache.UploadedFileEntry;
import lcsb.mapviewer.model.graphics.MapCanvasType;
import lcsb.mapviewer.model.map.MiriamData; import lcsb.mapviewer.model.map.MiriamData;
import lcsb.mapviewer.model.map.OverviewImage; import lcsb.mapviewer.model.map.OverviewImage;
import lcsb.mapviewer.model.map.OverviewImageLink; import lcsb.mapviewer.model.map.OverviewImageLink;
...@@ -123,6 +125,16 @@ public class Project implements Serializable { ...@@ -123,6 +125,16 @@ public class Project implements Serializable {
@Column(columnDefinition = "TEXT") @Column(columnDefinition = "TEXT")
private String warnings; private String warnings;
/**
* Which "maps" implementation should be used for frontend visualization.
*/
@Enumerated(EnumType.STRING)
@Column(name="map_canvas_type")
private MapCanvasType mapCanvasType = MapCanvasType.OPEN_LAYERS;
@Column(name="google_map_license_accept_date")
private Calendar googleMapLicenseAcceptDate;
/** /**
* Map models in the project. * Map models in the project.
*/ */
...@@ -586,4 +598,20 @@ public class Project implements Serializable { ...@@ -586,4 +598,20 @@ public class Project implements Serializable {
this.notifyEmail = notifyEmail; this.notifyEmail = notifyEmail;
} }
public MapCanvasType getMapCanvasType() {
return mapCanvasType;
}
public void setMapCanvasType(MapCanvasType mapCanvasType) {
this.mapCanvasType = mapCanvasType;
}
public Calendar getGoogleMapLicenseAcceptDate() {
return googleMapLicenseAcceptDate;
}
public void setGoogleMapLicenseAcceptDate(Calendar googleMapLicenseAcceptDate) {
this.googleMapLicenseAcceptDate = googleMapLicenseAcceptDate;
}
} }
package lcsb.mapviewer.model.graphics;
public enum MapCanvasType {
GOOGLE_MAPS_API, OPEN_LAYERS
}
-- alternative implementation of map canvas
alter table project_table add column google_map_license_accept_date timestamp without time zone;
alter table project_table add column map_canvas_type character varying default 'OPEN_LAYERS';
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment